merge of 33f4be1133cebee4982e71a112c41019f41018c7
authorRod Whitby <rod@whitby.id.au>
Tue, 5 Sep 2006 14:31:24 +0000 (14:31 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 5 Sep 2006 14:31:24 +0000 (14:31 +0000)
     and c6ec5439acd914995223480fe072be1b263ab120


Trivial merge