merge of 31503632aa868621c7106edd1358385e9c8f4267
authorRod Whitby <rod@whitby.id.au>
Fri, 18 Aug 2006 12:16:10 +0000 (12:16 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 18 Aug 2006 12:16:10 +0000 (12:16 +0000)
     and 3aca33802c68590787676070907dfe5fc1e18a5e


Trivial merge