merge of '1664f078d7d8c6db4b6cc004f6007fe7f4067110'
authorPhilip Balister <philip@balister.org>
Tue, 2 Jan 2007 18:21:05 +0000 (18:21 +0000)
committerPhilip Balister <philip@balister.org>
Tue, 2 Jan 2007 18:21:05 +0000 (18:21 +0000)
     and '35295539f35711d3d5d7793b86a6c556fd07a396'


Trivial merge