Merge.
authorshand@kneesaa.uk.xensource.com <shand@kneesaa.uk.xensource.com>
Thu, 29 Jun 2006 10:20:46 +0000 (11:20 +0100)
committershand@kneesaa.uk.xensource.com <shand@kneesaa.uk.xensource.com>
Thu, 29 Jun 2006 10:20:46 +0000 (11:20 +0100)

Trivial merge