merge of ad4e848a7b84675e9075f4e9dfd733e81992a9d5
authorRod Whitby <rod@whitby.id.au>
Mon, 11 Dec 2006 14:48:01 +0000 (14:48 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 11 Dec 2006 14:48:01 +0000 (14:48 +0000)
     and dc64d1d8240fb5fc73cab25cb94b00a561383ff9


Trivial merge