]> xenbits.xensource.com Git - people/vhanquez/xen-unstable.git/commitdiff
Merge
authorIan Jackson <Ian.Jackson@eu.citrix.com>
Thu, 6 Jan 2011 17:26:53 +0000 (17:26 +0000)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Thu, 6 Jan 2011 17:26:53 +0000 (17:26 +0000)

Trivial merge