From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Thu, 11 Dec 2008 17:22:37 +0000 (+0000)
Subject: Merge branch 'master' of ../qemu-2iwj
X-Git-Tag: t.master-before-merge~48
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=167bc570eca4f908905cd7b59bef7f259c5355c0;p=qemu-xen-4.0-testing.git

Merge branch 'master' of ../qemu-2iwj
---

167bc570eca4f908905cd7b59bef7f259c5355c0