merge of 26c5fc34518c68be3cba8e167c86a26739174086
authorRod Whitby <rod@whitby.id.au>
Fri, 8 Dec 2006 09:46:42 +0000 (09:46 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 8 Dec 2006 09:46:42 +0000 (09:46 +0000)
     and e48bd948fdab5b572353b2fe788003df5ba59599


Trivial merge