Migration with svn revision 66958
authorJaehwan Kim <jae.hwan.kim@samsung.com>
Mon, 9 Jan 2012 02:22:44 +0000 (11:22 +0900)
committerJaehwan Kim <jae.hwan.kim@samsung.com>
Mon, 16 Jan 2012 07:47:58 +0000 (16:47 +0900)
Merge remote branch 'origin/upstream'


Trivial merge