merge of 'eaf98be5dcfba80d61fd7d46052a466eef0710b7'
authorGraeme Gregory <dp@xora.org.uk>
Sun, 7 Oct 2007 18:24:25 +0000 (18:24 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Sun, 7 Oct 2007 18:24:25 +0000 (18:24 +0000)
     and 'efc59ba2f852cc347511e969a7a443ed2854c362'


Trivial merge