Merge branch 'master' of 165.213.180.234:slp/pkgs/e/elementary
authorHyoyoung Chang <hyoyoung.chang@samsung.com>
Wed, 5 Jan 2011 10:56:49 +0000 (19:56 +0900)
committerHyoyoung Chang <hyoyoung.chang@samsung.com>
Wed, 5 Jan 2011 10:56:49 +0000 (19:56 +0900)

Trivial merge