Merge branch 'x86_emulator'
authordk77.yun <dk77.yun@samsung.com>
Fri, 12 Aug 2011 04:47:04 +0000 (13:47 +0900)
committerdk77.yun <dk77.yun@samsung.com>
Fri, 12 Aug 2011 04:47:04 +0000 (13:47 +0900)

Trivial merge