Merge branch 'master' of 165.213.180.234:/git/slp/pkgs/elementary
authorDaniel Juyung Seo <juyung.seo@samsung.com>
Thu, 2 Dec 2010 06:04:56 +0000 (15:04 +0900)
committerDaniel Juyung Seo <juyung.seo@samsung.com>
Thu, 2 Dec 2010 06:04:56 +0000 (15:04 +0900)

Trivial merge