Merge branch 'master' of 165.213.180.234:/slp/pkgs/e/elementary
authorJaehwan Kim <jae.hwan.kim@samsung.com>
Tue, 7 Dec 2010 12:36:53 +0000 (21:36 +0900)
committerJaehwan Kim <jae.hwan.kim@samsung.com>
Tue, 7 Dec 2010 12:36:53 +0000 (21:36 +0900)

Trivial merge