merge of '93ecd3346baebbe99e4a2d92b718f5c6c1b1c887'
authorPhilip Balister <philip@balister.org>
Thu, 23 Aug 2007 15:58:47 +0000 (15:58 +0000)
committerPhilip Balister <philip@balister.org>
Thu, 23 Aug 2007 15:58:47 +0000 (15:58 +0000)
     and 'ca7f351c2182d8ceaaa964e33c74b9ec90ce64f5'


Trivial merge