merge of ac2124fc98391df1b17c8e6b7041eecdfa7543ed
authorRod Whitby <rod@whitby.id.au>
Fri, 25 Aug 2006 00:01:14 +0000 (00:01 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 25 Aug 2006 00:01:14 +0000 (00:01 +0000)
     and bd9e7e6ab916c283dd8aeed4ffd3aaf37239d2eb


Trivial merge