merge of '4113b1ae96ce03fbc8d4476d1cda0056a909f94e'
authorGraeme Gregory <dp@xora.org.uk>
Tue, 1 Aug 2006 10:01:09 +0000 (10:01 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Tue, 1 Aug 2006 10:01:09 +0000 (10:01 +0000)
     and 'f38165a0ab5b3933a6a8d8aff06ed4213e76b9ab'


Trivial merge