merge of 14cc680dbaa6317eec602330d2fe0ac7dea3be7a
authorRod Whitby <rod@whitby.id.au>
Mon, 28 Aug 2006 08:01:11 +0000 (08:01 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 28 Aug 2006 08:01:11 +0000 (08:01 +0000)
     and f44d275bf4228f606ebd4c69aec81b02d56b599b


Trivial merge