From: Ian Jackson <Ian.Jackson@eu.citrix.com>
Date: Fri, 23 Jul 2010 18:14:53 +0000 (+0100)
Subject: Merge
X-Git-Tag: 4.1.0-rc1~813
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=812154672062f5b022570c3f9f0c861bb8d71cae;p=xen.git

Merge
---

812154672062f5b022570c3f9f0c861bb8d71cae