Merge xen-api.hg changeset 142:d75413e65ba319d577c764be6c13efa5eae6da1c.
authorEwan Mellor <ewan@xensource.com>
Wed, 1 Nov 2006 10:40:46 +0000 (10:40 +0000)
committerEwan Mellor <ewan@xensource.com>
Wed, 1 Nov 2006 10:40:46 +0000 (10:40 +0000)
Signed-off-by: Ewan Mellor <ewan@xensource.com>

Trivial merge