merge of 4d9a5bbe5c65fe086c07e88aa353ead3d2d311ab
authorRod Whitby <rod@whitby.id.au>
Tue, 5 Sep 2006 08:31:31 +0000 (08:31 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 5 Sep 2006 08:31:31 +0000 (08:31 +0000)
     and a085bb7a7d5ec61683fc1c0366fb37bcceaa8669


Trivial merge