merge of '122762c7f94c2245c6d7d2b16bc8ae60ba8edab2'
authorPhilip Balister <philip@balister.org>
Wed, 8 Aug 2007 23:08:32 +0000 (23:08 +0000)
committerPhilip Balister <philip@balister.org>
Wed, 8 Aug 2007 23:08:32 +0000 (23:08 +0000)
     and '36843ed17320bc85c468fd1b0c75b2458b55b8ac'


Trivial merge