Merge branch 'master' of 165.213.180.234:/git/slp/pkgs/elementary
authorHyoyoung Chang <hyoyoung.chang@samsung.com>
Mon, 30 Aug 2010 13:14:33 +0000 (22:14 +0900)
committerHyoyoung Chang <hyoyoung.chang@samsung.com>
Mon, 30 Aug 2010 13:14:33 +0000 (22:14 +0900)

Trivial merge