merge of '4e808662b364403781cd4e899198db521c13afc9'
authorGraeme Gregory <dp@xora.org.uk>
Fri, 9 May 2008 15:33:24 +0000 (15:33 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Fri, 9 May 2008 15:33:24 +0000 (15:33 +0000)
     and '88288139695df3e5cc87ecfe407fbad1d201c362'


Trivial merge