merge of 2c0395eca082dabb6df91167e7e74e4868212e32
authorRod Whitby <rod@whitby.id.au>
Tue, 22 Aug 2006 21:01:18 +0000 (21:01 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 22 Aug 2006 21:01:18 +0000 (21:01 +0000)
     and 9c24baa55e4e98a8831ec77b7700b39932762e4f


Trivial merge