merge of '1db1a8c9924e0337a387abb95f676f3476f67dcb'
authorGraeme Gregory <dp@xora.org.uk>
Wed, 11 Jul 2007 11:22:34 +0000 (11:22 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Wed, 11 Jul 2007 11:22:34 +0000 (11:22 +0000)
     and '47c87f682cd85a075bc09f626973782b11025ad7'


Trivial merge