merge of '4d3d0b6ae8f717a39c5ed83392d7b9586ff20cd5'
authorGraeme Gregory <dp@xora.org.uk>
Mon, 2 Apr 2007 14:29:32 +0000 (14:29 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Mon, 2 Apr 2007 14:29:32 +0000 (14:29 +0000)
     and 'd40606a5d7a1fb1d8ed2fc4c9f20c363df46cf11'


Trivial merge