merge of 277f2a83646d0f7a24e0b10b4d24642817d8c5ed
authorRod Whitby <rod@whitby.id.au>
Fri, 8 Sep 2006 19:01:31 +0000 (19:01 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 8 Sep 2006 19:01:31 +0000 (19:01 +0000)
     and 7344e27c160a31398110dcb7d09bd0fc2995fc89


Trivial merge