merge of '8f0990c1c2ac36fbc06162157be83ae04403f8c6'
authorPhilip Balister <philip@balister.org>
Fri, 17 Aug 2007 14:01:51 +0000 (14:01 +0000)
committerPhilip Balister <philip@balister.org>
Fri, 17 Aug 2007 14:01:51 +0000 (14:01 +0000)
     and 'f4c81cd8dcea8c89262f32820d6f3764c5622e2a'


Trivial merge