merge of 9ef1e2290857ee6267e1252bc589b9df4f16af3d
authorRod Whitby <rod@whitby.id.au>
Fri, 18 Aug 2006 14:30:55 +0000 (14:30 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 18 Aug 2006 14:30:55 +0000 (14:30 +0000)
     and f370cb48efdf23e94cf290e6995a20520736afa8


Trivial merge