merge of '610425fd34abfbbedaf9b3792ed2d884bdda9fd3'
authorPhilip Balister <philip@balister.org>
Mon, 27 Aug 2007 21:17:49 +0000 (21:17 +0000)
committerPhilip Balister <philip@balister.org>
Mon, 27 Aug 2007 21:17:49 +0000 (21:17 +0000)
     and '9b318dc0ed758bbc0cbe978a0ff4471831b1df53'


Trivial merge