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

Merge branch 'master' into xen
---

1cb089c0a0fef52ec5753871c985aed7a0f726d4