Merge branch 'master' of 165.213.180.234:/git/slp/pkgs/elementary
authorHyoyoung Chang <hyoyoung.chang@samsung.com>
Wed, 25 Aug 2010 11:33:16 +0000 (20:33 +0900)
committerHyoyoung Chang <hyoyoung.chang@samsung.com>
Wed, 25 Aug 2010 11:33:16 +0000 (20:33 +0900)

Trivial merge