merge of 61c578136aee5397b10dbd411023369bebfed769
authorRod Whitby <rod@whitby.id.au>
Sun, 20 Aug 2006 02:45:59 +0000 (02:45 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 20 Aug 2006 02:45:59 +0000 (02:45 +0000)
     and f79e480392084bdbae07670461327da526458d3c


Trivial merge