]> xenbits.xensource.com Git - xen.git/commitdiff
Merge
authorKeir Fraser <keir.fraser@citrix.com>
Wed, 4 Aug 2010 18:24:17 +0000 (19:24 +0100)
committerKeir Fraser <keir.fraser@citrix.com>
Wed, 4 Aug 2010 18:24:17 +0000 (19:24 +0100)

Trivial merge