merge of '29ae1b3a205c9c321b38dd5f8946f42ed50afbd8'
authorGraeme Gregory <dp@xora.org.uk>
Mon, 12 Nov 2007 08:56:51 +0000 (08:56 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Mon, 12 Nov 2007 08:56:51 +0000 (08:56 +0000)
     and 'd7e830ff3c589d924990fe6ee78d4b99697d3525'


Trivial merge