merge of '87df0f67fea2eb35bb2d9bb5d84173bacece8d99'
authorPhilip Balister <philip@balister.org>
Thu, 23 Aug 2007 11:57:00 +0000 (11:57 +0000)
committerPhilip Balister <philip@balister.org>
Thu, 23 Aug 2007 11:57:00 +0000 (11:57 +0000)
     and 'e0613a176614c74d38f49dfbdb46b6f368ef64ca'


Trivial merge