From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Thu, 4 Dec 2008 18:17:04 +0000 (+0000)
Subject: Merge ../qemu-iwj
X-Git-Tag: t.master-before-merge~48^2~1
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=bb03457c5b86164dbc00fca8c7c866d1130ffd11;p=qemu-xen-4.0-testing.git

Merge ../qemu-iwj
---

bb03457c5b86164dbc00fca8c7c866d1130ffd11