merge of 'bb630da5015e0bccccc22590814ac62e46f845cc'
authorRod Whitby <rod@whitby.id.au>
Mon, 13 Nov 2006 10:21:44 +0000 (10:21 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 13 Nov 2006 10:21:44 +0000 (10:21 +0000)
     and 'd2780d1e5f22684b8da55657b296c576b7d56930'


Trivial merge