merge of 0ed81a8a6e7ec2637259ca6624cdbb448ffeaaf4
authorGraeme Gregory <dp@xora.org.uk>
Tue, 25 Jul 2006 15:16:18 +0000 (15:16 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Tue, 25 Jul 2006 15:16:18 +0000 (15:16 +0000)
     and d10cf3caecb413f91ffe6516c383074be10459cf


Trivial merge