merge of '18cf39ef0f56ba2b40f997fc34cf59f15054e7c4'
authorGraeme Gregory <dp@xora.org.uk>
Wed, 7 Feb 2007 11:22:41 +0000 (11:22 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Wed, 7 Feb 2007 11:22:41 +0000 (11:22 +0000)
     and 'be5bce993001e07eb5e869f8796ea1b1d05f3472'


Trivial merge