Merge branch 'qemu'

author Ian Jackson <iwj@mariner.uk.xensource.com>

Wed, 2 Jul 2008 17:38:35 +0000 (18:38 +0100)

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

Wed, 2 Jul 2008 17:38:35 +0000 (18:38 +0100)
author Ian Jackson <iwj@mariner.uk.xensource.com>
Wed, 2 Jul 2008 17:38:35 +0000 (18:38 +0100)
committer Ian Jackson <Ian.Jackson@eu.citrix.com>
Wed, 2 Jul 2008 17:38:35 +0000 (18:38 +0100)
diff --cc block-raw-posix.c
Simple merge
diff --cc block.c
Simple merge
author	Ian Jackson <iwj@mariner.uk.xensource.com>
	Wed, 2 Jul 2008 17:38:35 +0000 (18:38 +0100)
committer	Ian Jackson <Ian.Jackson@eu.citrix.com>
	Wed, 2 Jul 2008 17:38:35 +0000 (18:38 +0100)
		1	2
block-raw-posix.c	patch \|	diff1 \|	diff2 \|	blob \| history
block.c	patch \|	diff1 \|	diff2 \|	blob \| history