merge of 368fcbfed04b858aa5bba38e2e7d3b49eea16c69
authorRod Whitby <rod@whitby.id.au>
Fri, 25 Aug 2006 10:01:04 +0000 (10:01 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 25 Aug 2006 10:01:04 +0000 (10:01 +0000)
     and 53526775d6ee970cc212293fcfa79e27b87e4a5b


Trivial merge