merge of '924dc0c33239a73b288ecbb58f6d2ffae8848ed4'
authorPhilip Balister <philip@balister.org>
Mon, 28 Aug 2006 21:02:46 +0000 (21:02 +0000)
committerPhilip Balister <philip@balister.org>
Mon, 28 Aug 2006 21:02:46 +0000 (21:02 +0000)
     and 'aebf88ce897b2503c671d3dd0b5828248df55257'


Trivial merge