merge of '678b1e5c05a4cfa25000ad52b48967fdb1f47de9'
authorGraeme Gregory <dp@xora.org.uk>
Mon, 15 Jan 2007 15:18:48 +0000 (15:18 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Mon, 15 Jan 2007 15:18:48 +0000 (15:18 +0000)
     and 'fd75df8ff294fcf1fad13e6435c871db140e5380'


Trivial merge