merge of '0931cbd64db6d6e9a567bada1dd3b5bfd9362192'
authorPhilip Balister <philip@balister.org>
Tue, 14 Aug 2007 21:39:30 +0000 (21:39 +0000)
committerPhilip Balister <philip@balister.org>
Tue, 14 Aug 2007 21:39:30 +0000 (21:39 +0000)
     and '55a6d6c3852b2ced2a7f078fa495586c25a3a8e7'


Trivial merge