]> xenbits.xensource.com Git - xen.git/commitdiff
Merge
authorKeir Fraser <keir.fraser@citrix.com>
Wed, 23 Jun 2010 22:24:42 +0000 (23:24 +0100)
committerKeir Fraser <keir.fraser@citrix.com>
Wed, 23 Jun 2010 22:24:42 +0000 (23:24 +0100)

Trivial merge