Merge branch 'master' of 165.213.180.234:/git/slp2.0/slp2.0-pkgs/EFL-pkgs/elementary
authorDaniel Juyung Seo <juyung.seo@samsung.com>
Wed, 30 Jun 2010 05:49:11 +0000 (14:49 +0900)
committerDaniel Juyung Seo <juyung.seo@samsung.com>
Wed, 30 Jun 2010 05:49:11 +0000 (14:49 +0900)

Trivial merge