merge of 0f5fc910a03052e7b935c22cf24e1235f9cc1576
authorRod Whitby <rod@whitby.id.au>
Sat, 2 Sep 2006 11:31:14 +0000 (11:31 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 2 Sep 2006 11:31:14 +0000 (11:31 +0000)
     and 148128e51132bed7d8e3039fac94e08c23e74d6c


Trivial merge