merge of '26fd08fc76668842e8ea86206990f5188bc3afa6'
authorGraeme Gregory <dp@xora.org.uk>
Thu, 15 Mar 2007 12:45:26 +0000 (12:45 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Thu, 15 Mar 2007 12:45:26 +0000 (12:45 +0000)
     and '4c2e0c714dee3487dfde36966ee922357cfb407d'


Trivial merge