merge of 39efcc0a9c0b1a048e2e5e79a904ab27eca3c4c4
authorRod Whitby <rod@whitby.id.au>
Wed, 30 Aug 2006 10:16:14 +0000 (10:16 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 30 Aug 2006 10:16:14 +0000 (10:16 +0000)
     and d39c3b6e597d49b7042d69533e89e69cb70431f4


Trivial merge