merge of '517f7efe4d85e8dee36a5d83f349ea374199c9e0'
authorPhilip Balister <philip@balister.org>
Tue, 17 Oct 2006 19:21:47 +0000 (19:21 +0000)
committerPhilip Balister <philip@balister.org>
Tue, 17 Oct 2006 19:21:47 +0000 (19:21 +0000)
     and '9b4f11293547436ccf8d5e05c97485205a9d168b'


Trivial merge