merge of '05d7857e561d553fa8a2cb0f4804ddb7ad439b27'
authorRod Whitby <rod@whitby.id.au>
Fri, 10 Aug 2007 13:18:31 +0000 (13:18 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 10 Aug 2007 13:18:31 +0000 (13:18 +0000)
     and '3a92f90a4b9cae5ae633ec1058381c9527912c9a'


Trivial merge