Merge branch 'x86_emulator'
authorgune.kim <gune.kim@samsung.com>
Thu, 28 Jul 2011 05:26:35 +0000 (14:26 +0900)
committergune.kim <gune.kim@samsung.com>
Thu, 28 Jul 2011 05:26:35 +0000 (14:26 +0900)

Trivial merge