merge of bcb3d8772e830e87eeb88e0a5f581690f6d0cc6f
authorRod Whitby <rod@whitby.id.au>
Wed, 16 Aug 2006 12:16:14 +0000 (12:16 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 16 Aug 2006 12:16:14 +0000 (12:16 +0000)
     and bf613eac27975ea97757976c79ee18bb255ed21e


Trivial merge