merge of '81786bc5eee231cdb9c16dff4db1629456df1461'
authorPhilip Balister <philip@balister.org>
Tue, 24 Jul 2007 17:27:37 +0000 (17:27 +0000)
committerPhilip Balister <philip@balister.org>
Tue, 24 Jul 2007 17:27:37 +0000 (17:27 +0000)
     and 'e23d2e22f6c7c6ea4e507a9c6642f0c2d78b4129'


Trivial merge