merge of 0fea0578b1e3b58c2977ccba0088825f9112ffa8
authorRod Whitby <rod@whitby.id.au>
Mon, 28 Aug 2006 09:46:14 +0000 (09:46 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 28 Aug 2006 09:46:14 +0000 (09:46 +0000)
     and 5f173940d4d65a0eec53c94571695730f314001e


Trivial merge