merge of '576d11411cdf287490200b3387241d0bf692b87e'
authorPhilip Balister <philip@balister.org>
Thu, 19 Oct 2006 13:37:51 +0000 (13:37 +0000)
committerPhilip Balister <philip@balister.org>
Thu, 19 Oct 2006 13:37:51 +0000 (13:37 +0000)
     and 'b5894c077f731887492849019b4bde9fef49101a'


Trivial merge