merge of 4f8c11414ad697385b2ce842aa14e9c5d02a1167
authorRod Whitby <rod@whitby.id.au>
Fri, 25 Aug 2006 11:01:41 +0000 (11:01 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 25 Aug 2006 11:01:41 +0000 (11:01 +0000)
     and 95637c29b1fae92f53101dae9f8d21e0331ef040


Trivial merge