Merge branch 'x86_emulator'
authordk77.yun <dk77.yun@samsung.com>
Tue, 23 Aug 2011 10:44:33 +0000 (19:44 +0900)
committerdk77.yun <dk77.yun@samsung.com>
Tue, 23 Aug 2011 10:44:33 +0000 (19:44 +0900)

Trivial merge