merge of '3337ffac7330488189195b2df12d51db288e9ac8'
authorGraeme Gregory <dp@xora.org.uk>
Mon, 4 Sep 2006 15:16:16 +0000 (15:16 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Mon, 4 Sep 2006 15:16:16 +0000 (15:16 +0000)
     and '5d227caceeb62ba64050a701f15f08f65bd5f723'


Trivial merge