merge of 2d9eee8c16bb6bb0232beade8d8538e6a55c577e
authorRod Whitby <rod@whitby.id.au>
Wed, 15 Nov 2006 07:34:46 +0000 (07:34 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 15 Nov 2006 07:34:46 +0000 (07:34 +0000)
     and ed9696ef4fb1a4ce6b21e46ad70e0bb8e9e4c556


Trivial merge