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

Trivial merge