merge of '79ee8e5d416971bcb6924302dd4df9e744e9f0de'
authorGraeme Gregory <dp@xora.org.uk>
Thu, 12 Apr 2007 08:22:08 +0000 (08:22 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Thu, 12 Apr 2007 08:22:08 +0000 (08:22 +0000)
     and 'b5ab64e076cf06fd537ba34d7855dc87953fbec7'


Trivial merge