[*][Migration upstream r62530] Merge remote branch 'origin/upstream' into svn_merge
authorJaehwan Kim <jae.hwan.kim@samsung.com>
Mon, 22 Aug 2011 07:49:45 +0000 (16:49 +0900)
committerJaehwan Kim <jae.hwan.kim@samsung.com>
Fri, 2 Sep 2011 07:57:10 +0000 (16:57 +0900)

Trivial merge