merge of '82ba6ac51742ea64d989ab1d8b3b4633425bcd41'
authorPhilip Balister <philip@balister.org>
Sun, 3 Dec 2006 15:01:20 +0000 (15:01 +0000)
committerPhilip Balister <philip@balister.org>
Sun, 3 Dec 2006 15:01:20 +0000 (15:01 +0000)
     and 'b2521ddf7e798d79e5d8d18be1513bf0945cb051'


Trivial merge