merge of '32161ed8fe97769fa75537a6e2cce7e2a202a301'
authorPhilip Balister <philip@balister.org>
Wed, 25 Apr 2007 02:02:01 +0000 (02:02 +0000)
committerPhilip Balister <philip@balister.org>
Wed, 25 Apr 2007 02:02:01 +0000 (02:02 +0000)
     and 'bb1689f72c4d6e5659fe4a1b0b32c2ce23922e8a'


Trivial merge