merge of '56cef8ae3fb871ea0976b2101ed9a1aed03270cd'
authorPhilip Balister <philip@balister.org>
Wed, 18 Oct 2006 15:45:25 +0000 (15:45 +0000)
committerPhilip Balister <philip@balister.org>
Wed, 18 Oct 2006 15:45:25 +0000 (15:45 +0000)
     and 'fedad6b59fb05cfaca2abc090d29b3f03dd2cfee'


Trivial merge