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

Trivial merge