From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Thu, 23 Oct 2008 15:01:35 +0000 (+0100)
Subject: Merge branch 'master' of ../qemu-iwj
X-Git-Tag: xen-3.4.0-rc2~120
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=60a1c4251ac621f642cccdf763fa6113f650ca1b;p=qemu-xen-4.1-testing.git

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

60a1c4251ac621f642cccdf763fa6113f650ca1b