Merge branch 'svn_merge'
authorDaniel Juyung Seo <juyung.seo@samsung.com>
Mon, 1 Aug 2011 08:06:49 +0000 (17:06 +0900)
committerDaniel Juyung Seo <juyung.seo@samsung.com>
Mon, 1 Aug 2011 08:06:49 +0000 (17:06 +0900)

Trivial merge