merge of '828c7ed803d3e94f12cb5a5e38678504e4690482'
authorPhilip Balister <philip@balister.org>
Fri, 24 Aug 2007 22:45:55 +0000 (22:45 +0000)
committerPhilip Balister <philip@balister.org>
Fri, 24 Aug 2007 22:45:55 +0000 (22:45 +0000)
     and '8ed8bbac9b9eebe40941ad7b6102eea1ea5dc6f0'


Trivial merge