merge of '52496b27f127642a3f588c6e210021c39be53fb0'
authorPhilip Balister <philip@balister.org>
Thu, 19 Oct 2006 19:18:14 +0000 (19:18 +0000)
committerPhilip Balister <philip@balister.org>
Thu, 19 Oct 2006 19:18:14 +0000 (19:18 +0000)
     and '5c42ee91051149d61abc8ebbe9ea83a6177443ee'


Trivial merge