Merge branch 'master' of 165.213.180.234:/git/slp/pkgs/elementary
authorDaniel Juyung Seo <juyung.seo@samsung.com>
Sat, 30 Oct 2010 08:47:31 +0000 (17:47 +0900)
committerDaniel Juyung Seo <juyung.seo@samsung.com>
Sat, 30 Oct 2010 08:47:31 +0000 (17:47 +0900)

Trivial merge