merge of 01258feaf6b6bd7e383e43692fd47a44c7c97738
authorRod Whitby <rod@whitby.id.au>
Fri, 13 Oct 2006 00:01:42 +0000 (00:01 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 13 Oct 2006 00:01:42 +0000 (00:01 +0000)
     and b2d995227aebc5a8062a86981a2a4616cff0383e


Trivial merge