Merge branch 'master' of hyoyoung.chang@165.213.180.234:/git/slp/pkgs/elementary
authorHyoyoung Chang <hyoyoung.chang@samsung.com>
Mon, 26 Jul 2010 07:28:16 +0000 (16:28 +0900)
committerHyoyoung Chang <hyoyoung.chang@samsung.com>
Mon, 26 Jul 2010 07:28:16 +0000 (16:28 +0900)

Trivial merge