From: Ian Jackson <iwj@mariner.uk.xensource.com>
Date: Fri, 23 May 2008 17:28:28 +0000 (+0100)
Subject: Merge branch 'master' into xen
X-Git-Tag: xen-3.3.0-rc1~182
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=14f79a01a27be349c07103add63b033d2980c069;p=qemu-xen-4.1-testing.git

Merge branch 'master' into xen

Conflicts:
	hw/ide.c
---

14f79a01a27be349c07103add63b033d2980c069