merge of 'd253693f9ba8535d5eb55f96bdfd2b50531cfa16'
authorPhilip Balister <philip@balister.org>
Thu, 12 Apr 2007 12:05:52 +0000 (12:05 +0000)
committerPhilip Balister <philip@balister.org>
Thu, 12 Apr 2007 12:05:52 +0000 (12:05 +0000)
     and 'e006153174fed88db5828cf33bf4c76a78595dc5'


Trivial merge