merge of 011c3c348c03c4f7a5e1be3d10b2a7000ad4fadf
authorRod Whitby <rod@whitby.id.au>
Sat, 26 Aug 2006 14:31:01 +0000 (14:31 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 26 Aug 2006 14:31:01 +0000 (14:31 +0000)
     and 296e061a63c8fb02a900c71e3361ba42c55e434f


Trivial merge