Merge branch 'master' of 165.213.180.234:/git/slp/pkgs/elementary
authorHyoyoung Chang <hyoyoung.chang@samsung.com>
Thu, 2 Dec 2010 06:38:58 +0000 (15:38 +0900)
committerHyoyoung Chang <hyoyoung.chang@samsung.com>
Thu, 2 Dec 2010 06:38:58 +0000 (15:38 +0900)

Trivial merge