merge of '7d4cc29019d4d479c6301ca5482417150d83369f'
authorPhilip Balister <philip@balister.org>
Wed, 28 Feb 2007 23:34:36 +0000 (23:34 +0000)
committerPhilip Balister <philip@balister.org>
Wed, 28 Feb 2007 23:34:36 +0000 (23:34 +0000)
     and '90c07393f116dc9720db1a55b78192aaa456e97d'


Trivial merge