merge of '9bb5aacf211c840ef28190458936fec0e3163a18'
authorPhilip Balister <philip@balister.org>
Sat, 28 Oct 2006 13:48:12 +0000 (13:48 +0000)
committerPhilip Balister <philip@balister.org>
Sat, 28 Oct 2006 13:48:12 +0000 (13:48 +0000)
     and 'a89f7dd0fbeeb4f5627838591cb356337a0b5ae2'


Trivial merge