Merge branch 'x86_emulator'
authordk77.yun <dk77.yun@samsung.com>
Fri, 12 Aug 2011 17:58:41 +0000 (02:58 +0900)
committerdk77.yun <dk77.yun@samsung.com>
Fri, 12 Aug 2011 17:58:41 +0000 (02:58 +0900)

Trivial merge