Merge.
authorEwan Mellor <ewan@xensource.com>
Wed, 1 Nov 2006 10:41:44 +0000 (10:41 +0000)
committerEwan Mellor <ewan@xensource.com>
Wed, 1 Nov 2006 10:41:44 +0000 (10:41 +0000)
Signed-off-by: Ewan Mellor <ewan@xensource.com>

Trivial merge