merge of 1325f1127b878ef40c132892d17287ce5f1c1148
authorRod Whitby <rod@whitby.id.au>
Sat, 19 Aug 2006 12:16:09 +0000 (12:16 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 19 Aug 2006 12:16:09 +0000 (12:16 +0000)
     and b40cd07f7fdbc8f9356c65eaf44ca21e4e2fdcf7


Trivial merge