Merge branch 'master' of 165.213.180.234:/git/slp/pkgs/elementary
authorHyoyoung Chang <hyoyoung.chang@samsung.com>
Thu, 12 Aug 2010 01:36:03 +0000 (10:36 +0900)
committerHyoyoung Chang <hyoyoung.chang@samsung.com>
Thu, 12 Aug 2010 01:36:03 +0000 (10:36 +0900)

Trivial merge