merge of 83c6544ab0d6e5c00c12634423b8bf82329e9a91
authorRod Whitby <rod@whitby.id.au>
Tue, 29 Aug 2006 03:01:15 +0000 (03:01 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 29 Aug 2006 03:01:15 +0000 (03:01 +0000)
     and 8c9fa400aa857e0110b0a702db34db034b841697


Trivial merge