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

Trivial merge