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

Trivial merge