Merge branch 'x86_emulator'
authordk77.yun <dk77.yun@samsung.com>
Fri, 12 Aug 2011 09:45:48 +0000 (18:45 +0900)
committerdk77.yun <dk77.yun@samsung.com>
Fri, 12 Aug 2011 09:45:48 +0000 (18:45 +0900)

Trivial merge