Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Thu, 12 Jan 2006 12:20:04 +0000 (13:20 +0100)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Thu, 12 Jan 2006 12:20:04 +0000 (13:20 +0100)

Trivial merge