merge of '18d45ae122d3ca0b93e65c8b3dd5b5d599faa353'
authorGraeme Gregory <dp@xora.org.uk>
Wed, 29 Nov 2006 10:53:45 +0000 (10:53 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Wed, 29 Nov 2006 10:53:45 +0000 (10:53 +0000)
     and 'f7da96343a9468e225f1e148365b297adad82ad5'


Trivial merge