merge of 'e1d538a40dd18336f9f3f275226a93557d9741cf'
authorPhilip Balister <philip@balister.org>
Thu, 16 Aug 2007 21:45:57 +0000 (21:45 +0000)
committerPhilip Balister <philip@balister.org>
Thu, 16 Aug 2007 21:45:57 +0000 (21:45 +0000)
     and 'e6ff7fada36b2dd0f2a75f05cada2bc073f0bd4b'


Trivial merge