Merge branch 'master' of 165.213.180.234:/git/slp/pkgs/elementary
authorHyoyoung Chang <hyoyoung.chang@samsung.com>
Thu, 28 Oct 2010 12:26:17 +0000 (21:26 +0900)
committerHyoyoung Chang <hyoyoung.chang@samsung.com>
Thu, 28 Oct 2010 12:26:17 +0000 (21:26 +0900)

Trivial merge