Merge branch 'x86_emulator'
authorkt920.kim <kt920.kim@samsung.com>
Tue, 16 Aug 2011 13:51:42 +0000 (22:51 +0900)
committerkt920.kim <kt920.kim@samsung.com>
Tue, 16 Aug 2011 13:51:42 +0000 (22:51 +0900)

Trivial merge