Merge remote branch 'origin/upstream' into svn_merge
authorJaehwan Kim <jae.hwan.kim@samsung.com>
Mon, 22 Aug 2011 11:10:50 +0000 (20:10 +0900)
committerJaehwan Kim <jae.hwan.kim@samsung.com>
Mon, 22 Aug 2011 11:10:50 +0000 (20:10 +0900)

Trivial merge