merge of '4b48cc331d56f5ee9714871633ccb98a1cfe28e1'
authorPhilip Balister <philip@balister.org>
Mon, 3 Dec 2007 12:00:28 +0000 (12:00 +0000)
committerPhilip Balister <philip@balister.org>
Mon, 3 Dec 2007 12:00:28 +0000 (12:00 +0000)
     and '9e08f0a0ea353d01da3e8da16012b96b9e4e2fa2'


Trivial merge