merge of 0cb2088c75cd013fa4b79bb46028d9d384f0ef81
authorRod Whitby <rod@whitby.id.au>
Sun, 3 Sep 2006 02:16:10 +0000 (02:16 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 3 Sep 2006 02:16:10 +0000 (02:16 +0000)
     and 23cb7a1f5a80af5ac55e94cdb98f756f8c041763


Trivial merge