merge of '5766b94f1120049e60998bb120cf4519a884d89d'
authorPhilip Balister <philip@balister.org>
Fri, 20 Oct 2006 19:02:37 +0000 (19:02 +0000)
committerPhilip Balister <philip@balister.org>
Fri, 20 Oct 2006 19:02:37 +0000 (19:02 +0000)
     and 'a16077ae45108937659058d6916e0e2737965ec7'


Trivial merge