merge of 18b9ec04d7f267ce07ff8f28fbbe478a75728854
authorRod Whitby <rod@whitby.id.au>
Wed, 30 Aug 2006 07:46:16 +0000 (07:46 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 30 Aug 2006 07:46:16 +0000 (07:46 +0000)
     and 7ff3301c1054623d64c67d368c1997f39db2939f


Trivial merge