merge of 43921a863340a7eae6a5f33d7d3a1fa6c76bacca
authorRod Whitby <rod@whitby.id.au>
Wed, 30 Aug 2006 02:31:13 +0000 (02:31 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 30 Aug 2006 02:31:13 +0000 (02:31 +0000)
     and 488a2c7cb1bc73d4c8999e945cd5c0b61cb9e98b


Trivial merge