merge of '045e56420da1d629481fa1a4c311ddb81cfd68d8'
authorPhilip Balister <philip@balister.org>
Thu, 23 Aug 2007 14:06:09 +0000 (14:06 +0000)
committerPhilip Balister <philip@balister.org>
Thu, 23 Aug 2007 14:06:09 +0000 (14:06 +0000)
     and 'b7def8e05c706107b7e68312f5e8ca17c4bdda6b'


Trivial merge