From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Thu, 28 Aug 2008 14:46:36 +0000 (+0100)
Subject: Merge branch 'qemu'
X-Git-Tag: t.master-before-merge~102
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=2de1def923ad21cb52325b65ba27aa2e5017462b;p=qemu-xen-4.0-testing.git

Merge branch 'qemu'
---

2de1def923ad21cb52325b65ba27aa2e5017462b