merge of 'a353d9a082d436082c139102a0319641e531eaaf'
authorPhilip Balister <philip@balister.org>
Tue, 9 Jan 2007 16:55:20 +0000 (16:55 +0000)
committerPhilip Balister <philip@balister.org>
Tue, 9 Jan 2007 16:55:20 +0000 (16:55 +0000)
     and 'cd65725afb11c0f1959ea6a0ee3ad0749cf19ef9'


Trivial merge