merge of 02661077c56615b6f78a85ff37e8cf94cd9a3139
authorRod Whitby <rod@whitby.id.au>
Sat, 9 Sep 2006 07:01:30 +0000 (07:01 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 9 Sep 2006 07:01:30 +0000 (07:01 +0000)
     and 37a35d8b0c2c2c37d5624c388e4b3fb3abff6658


Trivial merge