Merge branch 'master' of 165.213.180.234:/git/slp/pkgs/elementary
authorHyunsil Park <hyunsil.park@samsung.com>
Mon, 30 Aug 2010 14:29:13 +0000 (23:29 +0900)
committerHyunsil Park <hyunsil.park@samsung.com>
Mon, 30 Aug 2010 14:29:13 +0000 (23:29 +0900)

Trivial merge