Merge branch 'master' of 165.213.180.234:/git/slp/pkgs/elementary
authorChunEon Park <chuneon.park@samsung.com>
Wed, 25 Aug 2010 23:59:54 +0000 (08:59 +0900)
committerChunEon Park <chuneon.park@samsung.com>
Wed, 25 Aug 2010 23:59:54 +0000 (08:59 +0900)

Trivial merge