merge of '471d0bd939972db8b9765eaaae30b43f2001abac'
authorPhilip Balister <philip@balister.org>
Tue, 3 Apr 2007 18:45:29 +0000 (18:45 +0000)
committerPhilip Balister <philip@balister.org>
Tue, 3 Apr 2007 18:45:29 +0000 (18:45 +0000)
     and '58149b1fe0252d2c717650db13dfa418e62af3de'


Trivial merge