merge of 3608f3d5434271fde9ce2b2c787339675d8a532f
authorRod Whitby <rod@whitby.id.au>
Sun, 20 Aug 2006 22:16:01 +0000 (22:16 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 20 Aug 2006 22:16:01 +0000 (22:16 +0000)
     and de381d3a29ee18e54e555b23be6bc70101eb1524


Trivial merge