merge of '0f9d9fcab0aab1ca6ebbb7e543fe8cb59479fbeb'
authorRod Whitby <rod@whitby.id.au>
Fri, 6 Apr 2007 14:31:31 +0000 (14:31 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 6 Apr 2007 14:31:31 +0000 (14:31 +0000)
     and 'd06fd2cd0014c2f9c2fa5c5046bfbb73145ca6e5'


Trivial merge