merge of '44bd9a4a5e1a364604d7155b9e6b34a405d65ef2'
authorPhilip Balister <philip@balister.org>
Tue, 20 Feb 2007 21:07:53 +0000 (21:07 +0000)
committerPhilip Balister <philip@balister.org>
Tue, 20 Feb 2007 21:07:53 +0000 (21:07 +0000)
     and '59b994b5bd442792462e35233ca2c36f2f0189fd'


Trivial merge