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

Trivial merge