[Migration upstream r62695] Merge remote branch 'origin/upstream' into svn_merge
authorJaehwan Kim <jae.hwan.kim@samsung.com>
Tue, 23 Aug 2011 04:03:02 +0000 (13:03 +0900)
committerJaehwan Kim <jae.hwan.kim@samsung.com>
Tue, 23 Aug 2011 04:03:20 +0000 (13:03 +0900)

Trivial merge