merge of '6665f976182e5c32b4c7db403b5591aae3ae836f'
authorGraeme Gregory <dp@xora.org.uk>
Mon, 27 Nov 2006 11:54:00 +0000 (11:54 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Mon, 27 Nov 2006 11:54:00 +0000 (11:54 +0000)
     and 'f2cd362e8e2df79c128decce8793c83a2a7b30f1'


Trivial merge