Merge branch 'master' of hyoyoung.chang@165.213.180.234:/git/slp/pkgs/elementary
authorHyoyoung Chang <hyoyoung.chang@samsung.com>
Mon, 2 Aug 2010 12:02:05 +0000 (21:02 +0900)
committerHyoyoung Chang <hyoyoung.chang@samsung.com>
Mon, 2 Aug 2010 12:02:05 +0000 (21:02 +0900)

Trivial merge