merge of 042c3e43aecabe7f5d5eaa92b66e4bcb9378669a
authorRod Whitby <rod@whitby.id.au>
Tue, 22 Aug 2006 16:32:19 +0000 (16:32 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 22 Aug 2006 16:32:19 +0000 (16:32 +0000)
     and 7bf39cf992a3dbe062066db3100333fa62967447


Trivial merge