Migration with svn revision 66150
authorJaehwan Kim <jae.hwan.kim@samsung.com>
Mon, 9 Jan 2012 02:30:11 +0000 (11:30 +0900)
committerJaehwan Kim <jae.hwan.kim@samsung.com>
Mon, 16 Jan 2012 08:39:41 +0000 (17:39 +0900)
Merge remote branch 'origin/upstream'


Trivial merge