merge of ae3a0b7d18ecf27edb385f86701998e25888d0c3
authorRod Whitby <rod@whitby.id.au>
Wed, 30 Aug 2006 09:46:29 +0000 (09:46 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 30 Aug 2006 09:46:29 +0000 (09:46 +0000)
     and da7632a154580311895110a4f07328ec4c6ed8fe


Trivial merge