merge of '7168bc90d12251e04fc9d38ea7a8082b002fff93'
authorGraeme Gregory <dp@xora.org.uk>
Mon, 11 Dec 2006 14:58:36 +0000 (14:58 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Mon, 11 Dec 2006 14:58:36 +0000 (14:58 +0000)
     and 'e97ced3dc091a93df4e70b2feabd08d3d70bafbc'


Trivial merge