From: Ian Jackson <Ian.Jackson@eu.citrix.com>
Date: Thu, 6 Jan 2011 17:26:53 +0000 (+0000)
Subject: Merge
X-Git-Tag: 4.1.0-rc1~79
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=08555dcf83d48025218bcddd6a6e9b36247a41db;p=people%2Fvhanquez%2Fxen-unstable.git

Merge
---

08555dcf83d48025218bcddd6a6e9b36247a41db