merge of ce714db58c973fa4c07bd3981ba8c3fbddb04e64
authorRod Whitby <rod@whitby.id.au>
Mon, 4 Sep 2006 10:33:12 +0000 (10:33 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 4 Sep 2006 10:33:12 +0000 (10:33 +0000)
     and e9396fac0f052fa56bf2461d1e8e9352cbcf409d


Trivial merge