merge of '208a6cd5055d6d34d2752d9347c76fd999cf39b3'
authorPhilip Balister <philip@balister.org>
Sat, 15 Sep 2007 20:29:23 +0000 (20:29 +0000)
committerPhilip Balister <philip@balister.org>
Sat, 15 Sep 2007 20:29:23 +0000 (20:29 +0000)
     and 'ec0908fb38643bd8e61b95eb5d013344c845452b'


Trivial merge