Merge branch 'x86_simulator' into release
authorYoonhyung.kim <yoonhyung.kim@samsung.com>
Tue, 28 Jun 2011 10:52:55 +0000 (19:52 +0900)
committerYoonhyung.kim <yoonhyung.kim@samsung.com>
Tue, 28 Jun 2011 10:52:55 +0000 (19:52 +0900)

Trivial merge