merge of '65fb29ae308602940228134ed6cbae42627b7c1e'
authorPhilip Balister <philip@balister.org>
Sun, 12 Aug 2007 23:15:12 +0000 (23:15 +0000)
committerPhilip Balister <philip@balister.org>
Sun, 12 Aug 2007 23:15:12 +0000 (23:15 +0000)
     and 'a3c9cfee8bbd98b2f5deca23d7508e6f6dca407b'


Trivial merge