merge of 189ca8e444a592299f4b0bd906b26afaeab4ba3b
authorRod Whitby <rod@whitby.id.au>
Wed, 23 Aug 2006 17:01:09 +0000 (17:01 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 23 Aug 2006 17:01:09 +0000 (17:01 +0000)
     and 784b6c6662b613aaddd772f5e839ca963189486d


Trivial merge