merge of 'c1c61d69184ac07768aa0ccbfec85a0d7d87ec8f'
authorPhilip Balister <philip@balister.org>
Mon, 9 Oct 2006 22:09:39 +0000 (22:09 +0000)
committerPhilip Balister <philip@balister.org>
Mon, 9 Oct 2006 22:09:39 +0000 (22:09 +0000)
     and 'd34ae4bc4eedb46746f3e03ce6a8dedf8d1a566a'


Trivial merge