Merge branch 'master' of 165.213.180.234:slp/pkgs/e/elementary
authorHyoyoung Chang <hyoyoung.chang@samsung.com>
Thu, 6 Jan 2011 08:34:02 +0000 (17:34 +0900)
committerHyoyoung Chang <hyoyoung.chang@samsung.com>
Thu, 6 Jan 2011 08:34:02 +0000 (17:34 +0900)

Trivial merge