merge of '0cf9456fa245ff793e08982af57529321f4f6576'
authorPhilip Balister <philip@balister.org>
Wed, 22 Aug 2007 16:38:04 +0000 (16:38 +0000)
committerPhilip Balister <philip@balister.org>
Wed, 22 Aug 2007 16:38:04 +0000 (16:38 +0000)
     and 'b86de5a43eb6fcad150e08dba726bb82d641f5f2'


Trivial merge