merge of cfd9ad7a92cec8e6bd5033ff5f9da8347c96ef80
authorRod Whitby <rod@whitby.id.au>
Thu, 31 Aug 2006 12:16:16 +0000 (12:16 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 31 Aug 2006 12:16:16 +0000 (12:16 +0000)
     and e16e6a228ba05836f11e6096da8531c66005dd42


Trivial merge