merge of '36192872b2176688fcbc4233f22dc68b6987bd11'
authorGraeme Gregory <dp@xora.org.uk>
Mon, 19 Nov 2007 15:46:45 +0000 (15:46 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Mon, 19 Nov 2007 15:46:45 +0000 (15:46 +0000)
     and '3efef7b4ec3372c8afd945bbe044ae2bc011cb38'


Trivial merge