merge of '444297a3111a94b97335747038fe18af35d24735'
authorPhilip Balister <philip@balister.org>
Fri, 10 Aug 2007 20:09:16 +0000 (20:09 +0000)
committerPhilip Balister <philip@balister.org>
Fri, 10 Aug 2007 20:09:16 +0000 (20:09 +0000)
     and '54b1077143d5e39c27829e8ac9f7ce627a908844'


Trivial merge