Merge branch 'master' of juyung.seo@165.213.180.234:/git/slp/pkgs/elementary
authorDaniel Juyung Seo <juyung.seo@samsung.com>
Thu, 7 Oct 2010 10:22:51 +0000 (19:22 +0900)
committerDaniel Juyung Seo <juyung.seo@samsung.com>
Thu, 7 Oct 2010 10:22:51 +0000 (19:22 +0900)

Trivial merge