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

Trivial merge