merge of '249c76d0a12f930196eb04dbaed9848311cd283a'
authorGraeme Gregory <dp@xora.org.uk>
Thu, 30 Aug 2007 10:34:13 +0000 (10:34 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Thu, 30 Aug 2007 10:34:13 +0000 (10:34 +0000)
     and 'f7b8fecab0a891e883df73b811b50dae38261186'


Trivial merge