From: Ian Jackson <Ian.Jackson@eu.citrix.com>
Date: Thu, 1 Mar 2012 16:48:36 +0000 (+0000)
Subject: Merge
X-Git-Tag: 4.2.0-rc1~711
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ff7c56c82c6f58d201c0bfcf57f58f574de7a57e;p=xen.git

Merge
---

ff7c56c82c6f58d201c0bfcf57f58f574de7a57e