merge of 2eba3bc567a71586736c7d186c47eb2c0b9e1376
authorRod Whitby <rod@whitby.id.au>
Sat, 16 Dec 2006 22:02:46 +0000 (22:02 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 16 Dec 2006 22:02:46 +0000 (22:02 +0000)
     and 3b6174728a6dcff419092d6acc08ec46965aa3e4


Trivial merge