[Upstream Migration r62360] Merge branch 'upstream' into svn_merge
authorDaniel Juyung Seo <juyung.seo@samsung.com>
Fri, 12 Aug 2011 05:59:30 +0000 (14:59 +0900)
committerDaniel Juyung Seo <juyung.seo@samsung.com>
Fri, 12 Aug 2011 06:51:46 +0000 (15:51 +0900)

Trivial merge