merge of '5b34006a886a797a6d06678129380ba60e87a9d8'
authorPhilip Balister <philip@balister.org>
Thu, 2 Aug 2007 19:23:45 +0000 (19:23 +0000)
committerPhilip Balister <philip@balister.org>
Thu, 2 Aug 2007 19:23:45 +0000 (19:23 +0000)
     and '61f3fd528334e7f514021b99ecf6ab6cf271760a'


Trivial merge