merge of 3596a639cb106771bb7608dc97bc4ad1d5c21e7c
authorRod Whitby <rod@whitby.id.au>
Sun, 3 Sep 2006 19:01:50 +0000 (19:01 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 3 Sep 2006 19:01:50 +0000 (19:01 +0000)
     and bd8fadd91b442525e1cc584349402a0e6fb13719


Trivial merge