Merge commit '1f3c518780e0effc4b099b5abe20cd3a95ecaa6c' into svn_merge
authorDaniel Juyung Seo <juyung.seo@samsung.com>
Sun, 14 Aug 2011 06:59:52 +0000 (15:59 +0900)
committerDaniel Juyung Seo <juyung.seo@samsung.com>
Sun, 14 Aug 2011 06:59:52 +0000 (15:59 +0900)

Trivial merge