Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Tue, 24 Jan 2006 16:54:34 +0000 (17:54 +0100)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Tue, 24 Jan 2006 16:54:34 +0000 (17:54 +0100)

Trivial merge