Merge branch 'master' of 165.213.180.234:/git/slp/pkgs/elementary
authorDaniel Juyung Seo <juyung.seo@samsung.com>
Fri, 20 Aug 2010 11:54:09 +0000 (20:54 +0900)
committerDaniel Juyung Seo <juyung.seo@samsung.com>
Fri, 20 Aug 2010 11:54:09 +0000 (20:54 +0900)

Trivial merge