merge of 11fba4b61b1e587f931023844ab267d82fa5c080
authorRod Whitby <rod@whitby.id.au>
Fri, 13 Oct 2006 13:01:08 +0000 (13:01 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 13 Oct 2006 13:01:08 +0000 (13:01 +0000)
     and 8b1b5b68ff8d4cf09a34113688ed651d6ea3c6cd


Trivial merge