Merge branch 'master' of 165.213.180.234:/git/slp2.0/slp2.0-pkgs/EFL-pkgs/elementary
authorDaniel Juyung Seo <juyung.seo@samsung.com>
Thu, 1 Jul 2010 13:34:47 +0000 (22:34 +0900)
committerDaniel Juyung Seo <juyung.seo@samsung.com>
Thu, 1 Jul 2010 13:34:47 +0000 (22:34 +0900)

Trivial merge