Merge branch 'master' into x86_emulator
authorgune.kim <gune.kim@samsung.com>
Wed, 27 Jul 2011 05:38:06 +0000 (14:38 +0900)
committergune.kim <gune.kim@samsung.com>
Wed, 27 Jul 2011 05:38:06 +0000 (14:38 +0900)

Trivial merge