merge of 8605731b4522785b2e02d610d5eb7f491cffad2d
authorRod Whitby <rod@whitby.id.au>
Wed, 30 Aug 2006 21:46:30 +0000 (21:46 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 30 Aug 2006 21:46:30 +0000 (21:46 +0000)
     and fc1732cf7e4fb24bf765ee81ceaee15b42ff57d6


Trivial merge