merge of '61fe56a76ce536d672adc18c3cdca0373750dd33'
authorGraeme Gregory <dp@xora.org.uk>
Tue, 10 Jul 2007 14:14:50 +0000 (14:14 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Tue, 10 Jul 2007 14:14:50 +0000 (14:14 +0000)
     and 'bfc292511191a1c641abb3c79b523c4c95e33a03'


Trivial merge