merge of 4b5a9c36e8db98bd960824fe82d251052de80c28
authorRod Whitby <rod@whitby.id.au>
Mon, 21 Aug 2006 00:46:10 +0000 (00:46 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 21 Aug 2006 00:46:10 +0000 (00:46 +0000)
     and 91eb3994730b15f22d72f00740f5ff46a272f2f7


Trivial merge