Conflicts:

	qemu/block.c
	qemu/configure
	qemu/cpu-defs.h
	qemu/cutils.c
	qemu/exec-all.h
	qemu/exec.c
	qemu/monitor.c
	qemu/target-i386/helper.c
	qemu/vl.c

Signed-off-by: Avi Kivity <avi@qumranet.com>