merge of 'c52d04f83b7eef3842ea742601beddaf2691356e'
authorGraeme Gregory <dp@xora.org.uk>
Thu, 25 Oct 2007 08:43:34 +0000 (08:43 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Thu, 25 Oct 2007 08:43:34 +0000 (08:43 +0000)
     and 'fce2adbdc811d266a8655968e8ba49f814ae434e'


Trivial merge