Migration with svn revision @65860
authorJaehwan Kim <jae.hwan.kim@samsung.com>
Tue, 6 Dec 2011 04:59:57 +0000 (13:59 +0900)
committerJaehwan Kim <jae.hwan.kim@samsung.com>
Thu, 8 Dec 2011 04:41:31 +0000 (13:41 +0900)
Merge remote branch 'origin/upstream'


Trivial merge