merge of '13e3b90d95842d6605bb97abd2e75c521fcc90ea'
authorGraeme Gregory <dp@xora.org.uk>
Fri, 7 Mar 2008 10:28:45 +0000 (10:28 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Fri, 7 Mar 2008 10:28:45 +0000 (10:28 +0000)
     and 'ddead9a9354451fc8ee51dad429309707f005db3'


Trivial merge