merge of 1c574776ca8b7967835b47517d85afe20e47e645
authorRod Whitby <rod@whitby.id.au>
Wed, 30 Aug 2006 08:16:22 +0000 (08:16 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 30 Aug 2006 08:16:22 +0000 (08:16 +0000)
     and b6ff43a6a08dd0b74f24e8a941f2464c79edc1ee


Trivial merge