merge of '143fecd103b7ad42c619a91d888c8b7e3b7f8fb3'
authorPhilip Balister <philip@balister.org>
Fri, 20 Oct 2006 19:01:21 +0000 (19:01 +0000)
committerPhilip Balister <philip@balister.org>
Fri, 20 Oct 2006 19:01:21 +0000 (19:01 +0000)
     and '97021a57e23ad3769708efc11bbfd4f366f29d24'


Trivial merge