merge of '9f9a8f182c5687e1b22ecb271d55bbea88d7c3d8'
authorGraeme Gregory <dp@xora.org.uk>
Thu, 19 Jul 2007 09:58:32 +0000 (09:58 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Thu, 19 Jul 2007 09:58:32 +0000 (09:58 +0000)
     and 'bbd0b43479b77b1fa90fdda304c5b4cd1ed94da8'


Trivial merge