merge of 'c0c96c93651e80c74259da321b816cfa0c76a7a1'
authorGraeme Gregory <dp@xora.org.uk>
Wed, 4 Oct 2006 10:24:43 +0000 (10:24 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Wed, 4 Oct 2006 10:24:43 +0000 (10:24 +0000)
     and 'e81ad8bbd55788f8132544a64394420053252ebf'


Trivial merge