merge of '225d874e6be0018719b0a6222b1dd91f19048aad'
authorGraeme Gregory <dp@xora.org.uk>
Tue, 5 Jun 2007 12:03:46 +0000 (12:03 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Tue, 5 Jun 2007 12:03:46 +0000 (12:03 +0000)
     and '755520d5b141a9ba6f14d0230701bb57f3b82bb9'


Trivial merge