merge of '3771c597611822587b6e7491171f61908927b778'
authorPhilip Balister <philip@balister.org>
Wed, 1 Oct 2008 01:51:14 +0000 (01:51 +0000)
committerPhilip Balister <philip@balister.org>
Wed, 1 Oct 2008 01:51:14 +0000 (01:51 +0000)
     and 'd901f612d19291dc3b05e29b1d430e991e96602d'


Trivial merge