Merge branch 'master' of 165.213.180.234:/git/slp/pkgs/elementary
authorDaniel Juyung Seo <juyung.seo@samsung.com>
Wed, 29 Sep 2010 00:21:07 +0000 (09:21 +0900)
committerDaniel Juyung Seo <juyung.seo@samsung.com>
Wed, 29 Sep 2010 00:21:07 +0000 (09:21 +0900)

Trivial merge