From: Keir Fraser <keir.fraser@citrix.com>
Date: Wed, 23 Jun 2010 22:24:42 +0000 (+0100)
Subject: Merge
X-Git-Tag: 4.1.0-rc1~959
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=fde661bff917bfce00b7b16d999f5d937f24e75b;p=xen.git

Merge
---

fde661bff917bfce00b7b16d999f5d937f24e75b