merge of 2c909f3f0c12a8189dc59f032762d7f6e57134f0
authorRod Whitby <rod@whitby.id.au>
Fri, 22 Dec 2006 17:47:09 +0000 (17:47 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 22 Dec 2006 17:47:09 +0000 (17:47 +0000)
     and c7ad59a7180211472f8d9a21a61f3994b84b5b47


Trivial merge