merge of '334f1ee81c31102eb71d125911c2b1de3f3804d2'
authorPhilip Balister <philip@balister.org>
Mon, 17 Sep 2007 19:07:31 +0000 (19:07 +0000)
committerPhilip Balister <philip@balister.org>
Mon, 17 Sep 2007 19:07:31 +0000 (19:07 +0000)
     and 'e9a6786ef2e7a6c087283a96dd0a224bae8a9927'


Trivial merge