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


Trivial merge