merge of '7474030a47375702cb66f00aa7ded40e585cf3fd'
authorPhilip Balister <philip@balister.org>
Fri, 1 Jun 2007 17:38:18 +0000 (17:38 +0000)
committerPhilip Balister <philip@balister.org>
Fri, 1 Jun 2007 17:38:18 +0000 (17:38 +0000)
     and '9f671f6c3a17dbd8450e267353cf95d120238e50'


Trivial merge