merge of 6016fa0bf7402d89dcf3dc34a77bad5e750f2c11
authorRod Whitby <rod@whitby.id.au>
Wed, 30 Aug 2006 11:46:07 +0000 (11:46 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 30 Aug 2006 11:46:07 +0000 (11:46 +0000)
     and 708df891f9f12bc072e9dea6f782a23aa35bbc9e


Trivial merge