Merge branch 'x86_simulator' into release
authordon.hong <don.hong@samsung.com>
Wed, 13 Jul 2011 10:49:00 +0000 (19:49 +0900)
committerdon.hong <don.hong@samsung.com>
Wed, 13 Jul 2011 10:49:00 +0000 (19:49 +0900)

Trivial merge