[Upstream Migration r62382] Merge branch 'upstream' into svn_merge
authorDaniel Juyung Seo <juyung.seo@samsung.com>
Sun, 14 Aug 2011 07:10:11 +0000 (16:10 +0900)
committerDaniel Juyung Seo <juyung.seo@samsung.com>
Sun, 14 Aug 2011 07:10:54 +0000 (16:10 +0900)

Trivial merge