merge of 'b1b3feda7d897a425e7e06c085cbfab48b9e4f09'
authorPhilip Balister <philip@balister.org>
Mon, 27 Nov 2006 20:46:32 +0000 (20:46 +0000)
committerPhilip Balister <philip@balister.org>
Mon, 27 Nov 2006 20:46:32 +0000 (20:46 +0000)
     and 'f364b08c0bec4d1bbd76370204c058f1d372339f'


Trivial merge