From: Ian Jackson <iwj@mariner.uk.xensource.com>
Date: Tue, 27 May 2008 13:46:08 +0000 (+0100)
Subject: Merge branch 'master' into xen
X-Git-Tag: xen-3.3.0-rc1~180
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=bf3ee60e9c8ddd26cab223686ffa4dc7a650ea8a;p=qemu-xen-unstable.git

Merge branch 'master' into xen
---

bf3ee60e9c8ddd26cab223686ffa4dc7a650ea8a