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


Trivial merge