merge of '40f293b10b110d85c793d96acc26403ea53edb48'
authorGraeme Gregory <dp@xora.org.uk>
Thu, 22 Nov 2007 16:51:57 +0000 (16:51 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Thu, 22 Nov 2007 16:51:57 +0000 (16:51 +0000)
     and '8e1c07ccc20b627b1a8808a0a3b8a7afcaf72b79'


Trivial merge