Merge branch 'master' of 165.213.180.234:/git/slp/pkgs/elementary
authorHyoyoung Chang <hyoyoung.chang@samsung.com>
Fri, 17 Sep 2010 02:26:19 +0000 (11:26 +0900)
committerHyoyoung Chang <hyoyoung.chang@samsung.com>
Fri, 17 Sep 2010 02:26:19 +0000 (11:26 +0900)

Trivial merge