Merge branch 'x86_emulator'
authorkt920.kim <kt920.kim@samsung.com>
Mon, 8 Aug 2011 14:13:22 +0000 (23:13 +0900)
committerkt920.kim <kt920.kim@samsung.com>
Mon, 8 Aug 2011 14:13:22 +0000 (23:13 +0900)

Trivial merge