Merge branch 'x86_emulator'
authorsungmin82.ha <sungmin82.ha@samsung.com>
Fri, 29 Jul 2011 07:41:23 +0000 (16:41 +0900)
committersungmin82.ha <sungmin82.ha@samsung.com>
Fri, 29 Jul 2011 07:41:23 +0000 (16:41 +0900)

Trivial merge