Merge branch 'master' into svn_merge
authorDaniel Juyung Seo <juyung.seo@samsung.com>
Tue, 19 Jul 2011 06:52:37 +0000 (15:52 +0900)
committerDaniel Juyung Seo <juyung.seo@samsung.com>
Tue, 19 Jul 2011 06:52:37 +0000 (15:52 +0900)

Trivial merge