]> xenbits.xensource.com Git - xen.git/commitdiff
Merge
authorIan Jackson <Ian.Jackson@eu.citrix.com>
Fri, 23 Jul 2010 18:14:53 +0000 (19:14 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Fri, 23 Jul 2010 18:14:53 +0000 (19:14 +0100)

Trivial merge