merge of 3da2caa6a3dac230f20ffcd1b963e933f744dbfa
authorRod Whitby <rod@whitby.id.au>
Thu, 14 Dec 2006 12:17:20 +0000 (12:17 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 14 Dec 2006 12:17:20 +0000 (12:17 +0000)
     and c30e9d5fa2ac933e9c3df9f75465c891732a9107


Trivial merge