Merge branch 'master' of 165.213.180.234:/git/slp/pkgs/elementary
authorChunEon Park <chuneon.park@samsung.com>
Wed, 1 Dec 2010 00:09:15 +0000 (09:09 +0900)
committerChunEon Park <chuneon.park@samsung.com>
Wed, 1 Dec 2010 00:09:15 +0000 (09:09 +0900)

Trivial merge