merge of '161e1a738dc05762f428e26351dfe3cf5cd65ec4'
authorPhilip Balister <philip@balister.org>
Wed, 6 Jun 2007 18:09:54 +0000 (18:09 +0000)
committerPhilip Balister <philip@balister.org>
Wed, 6 Jun 2007 18:09:54 +0000 (18:09 +0000)
     and '429b72487e1ea782f82e67b30cb024ff50fdc4fb'


Trivial merge