merge of 24283da3dc0742e26ebecf1a294d55e38821072e
authorRod Whitby <rod@whitby.id.au>
Thu, 24 Aug 2006 17:46:49 +0000 (17:46 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 24 Aug 2006 17:46:49 +0000 (17:46 +0000)
     and b3e0de23c7ab8937d191bde866a56304b99967df


Trivial merge