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

Trivial merge