merge of '172e330b964d32daab793a9adb3cc9dc29f58af6'
authorPhilip Balister <philip@balister.org>
Fri, 13 Oct 2006 14:52:15 +0000 (14:52 +0000)
committerPhilip Balister <philip@balister.org>
Fri, 13 Oct 2006 14:52:15 +0000 (14:52 +0000)
     and 'b7fc885dd4f576de1825063502bd8ff8189fd4c0'


Trivial merge