merge of '4d2506a7328df70c3c1b58a19a5f52a6e6841a91'
authorPhilip Balister <philip@balister.org>
Thu, 19 Oct 2006 11:13:32 +0000 (11:13 +0000)
committerPhilip Balister <philip@balister.org>
Thu, 19 Oct 2006 11:13:32 +0000 (11:13 +0000)
     and '95790f96b79f6c36ad3f1f583d73e9d450736479'


Trivial merge