merge of '54a5d8fb4d7a6a20f8dd77f12f48946c8af71061'
authorPhilip Balister <philip@balister.org>
Sun, 23 Sep 2007 18:56:53 +0000 (18:56 +0000)
committerPhilip Balister <philip@balister.org>
Sun, 23 Sep 2007 18:56:53 +0000 (18:56 +0000)
     and '7b5746140aa364c513fc814efde39c90df31234e'


Trivial merge