merge of 'b4098f24cc813219f0db6c7ee5507702211f33f1'
authorGraeme Gregory <dp@xora.org.uk>
Thu, 7 Dec 2006 11:47:04 +0000 (11:47 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Thu, 7 Dec 2006 11:47:04 +0000 (11:47 +0000)
     and 'e04dfc0f316cf7658962b9bea450c8989c8a7d2f'


Trivial merge