merge of '0038f02055e33a3dad0ba914de112ce9450c45d4'
authorPhilip Balister <philip@balister.org>
Thu, 8 Mar 2007 17:14:53 +0000 (17:14 +0000)
committerPhilip Balister <philip@balister.org>
Thu, 8 Mar 2007 17:14:53 +0000 (17:14 +0000)
     and '63be5372eff18386938a49223024bae37d7978a9'


Trivial merge