merge of '4e669af0ea55b9b9ba44d6dc7d149da48ab9b139'
authorGraeme Gregory <dp@xora.org.uk>
Wed, 10 Oct 2007 09:18:39 +0000 (09:18 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Wed, 10 Oct 2007 09:18:39 +0000 (09:18 +0000)
     and 'af0790bf9393bac4ed622dfd962d7bf5512bd7e4'


Trivial merge