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

Trivial merge