merge of 9faa5f9bca0726d8c098e3f9aa7f0b947799029b
authorRod Whitby <rod@whitby.id.au>
Fri, 8 Sep 2006 12:46:18 +0000 (12:46 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 8 Sep 2006 12:46:18 +0000 (12:46 +0000)
     and c7f9d50b7c841b95987caa4aeb4d61c1902a3542


Trivial merge