From: SeokYeon Hwang <syeon.hwang@samsung.com>
Date: Tue, 16 Jul 2013 04:57:40 +0000 (+0900)
Subject: Merge branch 'tizen_qemu_1.5.1' into develop
X-Git-Tag: TizenStudio_2.0_p2.3~768
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=76753084b1178778a8dcfdad5898159022dbb875;p=sdk%2Femulator%2Fqemu.git

Merge branch 'tizen_qemu_1.5.1' into develop

Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

Conflicts:
	console.h
	hw/ps2.c
	input.c
---

76753084b1178778a8dcfdad5898159022dbb875