merge of cb591f5b883733fa2368b93267c8b93a727fa2c7
authorRod Whitby <rod@whitby.id.au>
Sat, 19 Aug 2006 16:31:16 +0000 (16:31 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 19 Aug 2006 16:31:16 +0000 (16:31 +0000)
     and fc7dbf68b690a52e902e149f664580d3174d52e9


Trivial merge