merge
authorKeir Fraser <keir@xen.org>
Wed, 1 Jun 2011 15:42:39 +0000 (16:42 +0100)
committerKeir Fraser <keir@xen.org>
Wed, 1 Jun 2011 15:42:39 +0000 (16:42 +0100)

Trivial merge