Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Wed, 7 Jun 2006 10:03:51 +0000 (11:03 +0100)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Wed, 7 Jun 2006 10:03:51 +0000 (11:03 +0100)

Trivial merge