merge of 4a6c98f50cab8200c2b5bf961610a0006fd13ee9
authorRod Whitby <rod@whitby.id.au>
Thu, 14 Dec 2006 20:22:02 +0000 (20:22 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 14 Dec 2006 20:22:02 +0000 (20:22 +0000)
     and 4f539a7cc5d9e9ba9c76366bbe73421bb8ecdc3c


Trivial merge