merge of 8a20067d752933aff6ff7c7f2211a1631e5fe204
authorRod Whitby <rod@whitby.id.au>
Mon, 18 Dec 2006 21:33:31 +0000 (21:33 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 18 Dec 2006 21:33:31 +0000 (21:33 +0000)
     and a74be6917766e52432e5a568c76b7232f0cb0cda


Trivial merge