merge of 'b266d00fc6fbbe7f1b67452f019bc173da3eb49d'
authorGraeme Gregory <dp@xora.org.uk>
Tue, 16 Oct 2007 15:40:26 +0000 (15:40 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Tue, 16 Oct 2007 15:40:26 +0000 (15:40 +0000)
     and 'd1cdb61789b6a035fdaff06f37d6490c67bcccc0'


Trivial merge