merge of '4f64cc3dea865c4685261d303267199508fc3487'
authorGraeme Gregory <dp@xora.org.uk>
Tue, 30 Oct 2007 15:44:53 +0000 (15:44 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Tue, 30 Oct 2007 15:44:53 +0000 (15:44 +0000)
     and '651defa9295237cd8d3fc50ef043ba40c901030c'


Trivial merge