merge of '83c4f209d12306d38f3b5bdb26e65c3a97013417'
authorPhilip Balister <philip@balister.org>
Fri, 20 Oct 2006 18:57:13 +0000 (18:57 +0000)
committerPhilip Balister <philip@balister.org>
Fri, 20 Oct 2006 18:57:13 +0000 (18:57 +0000)
     and '83d7c4d760eeb9ffa8b4c744fbd257d182d6a207'


Trivial merge