merge of 497cad041aa6aaf648fb920d3abe16b7ac10ce3e
authorRod Whitby <rod@whitby.id.au>
Fri, 1 Sep 2006 13:46:33 +0000 (13:46 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 1 Sep 2006 13:46:33 +0000 (13:46 +0000)
     and 5168b30bc3346fee3089b72a661aec66ba5affe5


Trivial merge