merge of '1a8b8b461f0411e51d72fb156790d6c3a42558e1'
authorPhilip Balister <philip@balister.org>
Mon, 20 Nov 2006 21:56:55 +0000 (21:56 +0000)
committerPhilip Balister <philip@balister.org>
Mon, 20 Nov 2006 21:56:55 +0000 (21:56 +0000)
     and '71deae698707365d8af709b9ddc7ca4b81741065'


Trivial merge