merge of 18951ff4809c89983fbc5eab164597d7d254041c
authorRod Whitby <rod@whitby.id.au>
Wed, 6 Sep 2006 10:46:27 +0000 (10:46 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 6 Sep 2006 10:46:27 +0000 (10:46 +0000)
     and f1efa8a84381fd48e812829cb2440952e720bfd1


Trivial merge