merge of '4990ba855f0ea2bae626b67500e77e88d48dabca'
authorPhilip Balister <philip@balister.org>
Tue, 28 Aug 2007 11:28:14 +0000 (11:28 +0000)
committerPhilip Balister <philip@balister.org>
Tue, 28 Aug 2007 11:28:14 +0000 (11:28 +0000)
     and '95e88a1838246f2647083a1824d4136e4b3f2073'


Trivial merge