merge of '07f6b04ff19cbcdb85f1fe8430bbad17da3b0a7c'
authorGraeme Gregory <dp@xora.org.uk>
Wed, 5 Mar 2008 16:05:19 +0000 (16:05 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Wed, 5 Mar 2008 16:05:19 +0000 (16:05 +0000)
     and '4576a315b90d6f3ce5db709905287a7b00ee6198'


Trivial merge