merge of '368dc50e87fa25338c003788d5a971d97ad9fd9a'
authorPhilip Balister <philip@balister.org>
Tue, 16 Jan 2007 13:03:56 +0000 (13:03 +0000)
committerPhilip Balister <philip@balister.org>
Tue, 16 Jan 2007 13:03:56 +0000 (13:03 +0000)
     and 'd3cf8b2dc3f6eab1985f1d8b6243e5c4a52cb4bb'


Trivial merge