merge of 1822d1a8f0fa2b6eaefbe7d5d0caa555299d4185
authorRod Whitby <rod@whitby.id.au>
Tue, 5 Sep 2006 16:46:17 +0000 (16:46 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 5 Sep 2006 16:46:17 +0000 (16:46 +0000)
     and 4e7386151d1273724db821c550dbd7106a83f5ab


Trivial merge