merge of 4397d57a129563fde1aa8ebd31aadee8edbd8994
authorRod Whitby <rod@whitby.id.au>
Wed, 23 Aug 2006 00:16:21 +0000 (00:16 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 23 Aug 2006 00:16:21 +0000 (00:16 +0000)
     and 5c6bd9229c2912167e04e747499aa015e936f86e


Trivial merge