Migration with svn revision @65617
authorJaehwan Kim <jae.hwan.kim@samsung.com>
Mon, 28 Nov 2011 04:25:21 +0000 (13:25 +0900)
committerJaehwan Kim <jae.hwan.kim@samsung.com>
Tue, 29 Nov 2011 05:12:46 +0000 (14:12 +0900)
Merge remote branch 'origin/upstream'


Trivial merge