merge of 8c12c313f6826aa8f20205f0d2756a8970c8e730
authorRod Whitby <rod@whitby.id.au>
Wed, 16 Aug 2006 03:16:21 +0000 (03:16 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 16 Aug 2006 03:16:21 +0000 (03:16 +0000)
     and f54c97bd2fc98befdf9aec819418dddcc1d14b9a


Trivial merge