merge of '166f244ef427b574bc894a4585b773997e302e97'
authorPhilip Balister <philip@balister.org>
Tue, 16 Jan 2007 13:12:24 +0000 (13:12 +0000)
committerPhilip Balister <philip@balister.org>
Tue, 16 Jan 2007 13:12:24 +0000 (13:12 +0000)
     and '86d064241f76c59a2663d25f57ee15ef950bee4b'


Trivial merge