Merge branch 'qemu'

author Ian Jackson <ian.jackson@eu.citrix.com>

Fri, 18 Jul 2008 14:56:27 +0000 (15:56 +0100)

committer Ian Jackson <Ian.Jackson@eu.citrix.com>

Fri, 18 Jul 2008 14:56:27 +0000 (15:56 +0100)
author Ian Jackson <ian.jackson@eu.citrix.com>
Fri, 18 Jul 2008 14:56:27 +0000 (15:56 +0100)
committer Ian Jackson <Ian.Jackson@eu.citrix.com>
Fri, 18 Jul 2008 14:56:27 +0000 (15:56 +0100)
diff --cc hw/ide.c
Simple merge
diff --cc vl.c
Simple merge
author	Ian Jackson <ian.jackson@eu.citrix.com>
	Fri, 18 Jul 2008 14:56:27 +0000 (15:56 +0100)
committer	Ian Jackson <Ian.Jackson@eu.citrix.com>
	Fri, 18 Jul 2008 14:56:27 +0000 (15:56 +0100)
		1	2
hw/ide.c	patch \|	diff1 \|	diff2 \|	blob \| history
vl.c	patch \|	diff1 \|	diff2 \|	blob \| history