Merge branch 'master' into svn_merge
authorDaniel Juyung Seo <juyung.seo@samsung.com>
Thu, 14 Jul 2011 05:19:02 +0000 (14:19 +0900)
committerDaniel Juyung Seo <juyung.seo@samsung.com>
Thu, 14 Jul 2011 05:19:02 +0000 (14:19 +0900)

Trivial merge