From: Ian Jackson <iwj@mariner.uk.xensource.com>
Date: Fri, 4 Jul 2008 15:48:24 +0000 (+0100)
Subject: Merge ../qemu-2iwj
X-Git-Tag: xen-3.3.0-rc1~58
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=685f485f9ea2595873b7170bc9c71ecc6bfd4e4c;p=qemu-xen-4.2-testing.git

Merge ../qemu-2iwj
---

685f485f9ea2595873b7170bc9c71ecc6bfd4e4c