merge of '925f2bbcc23f29f43bf7a84cd36ee63207fe69a3'
authorGraeme Gregory <dp@xora.org.uk>
Sun, 7 Oct 2007 17:19:07 +0000 (17:19 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Sun, 7 Oct 2007 17:19:07 +0000 (17:19 +0000)
     and 'fd419e88800bcbae95ec2fc56e3f42cb5e50777a'


Trivial merge