Merge branch 'svn_merge' of 165.213.180.234:slp/pkgs/e/elementary into svn_merge
authorDaniel Juyung Seo <juyung.seo@samsung.com>
Thu, 14 Jul 2011 03:59:24 +0000 (12:59 +0900)
committerDaniel Juyung Seo <juyung.seo@samsung.com>
Thu, 14 Jul 2011 03:59:24 +0000 (12:59 +0900)

Trivial merge