merge of '3df50a7108e4f25287e1ae4e52bfb7bc1aa7e2df'
authorGraeme Gregory <dp@xora.org.uk>
Fri, 1 Feb 2008 15:32:54 +0000 (15:32 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Fri, 1 Feb 2008 15:32:54 +0000 (15:32 +0000)
     and 'cb775f550e7bb6db676bbeebfc81eee971afcf27'


Trivial merge