merge of '046d6d9432d8b2f9c1768927b44311f32da334f0'
authorPhilip Balister <philip@balister.org>
Sun, 26 Aug 2007 13:46:41 +0000 (13:46 +0000)
committerPhilip Balister <philip@balister.org>
Sun, 26 Aug 2007 13:46:41 +0000 (13:46 +0000)
     and '641c0ed5d9b91d2a89f0918ddfbd5c0a67eee6a9'


Trivial merge