merge of '59ac76a98d175728e06d1a85a9533570b68cfad7'
authorRod Whitby <rod@whitby.id.au>
Thu, 20 Sep 2007 00:21:25 +0000 (00:21 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 20 Sep 2007 00:21:25 +0000 (00:21 +0000)
     and 'b78f2dc352e2e9c1e3c7c2020293e603d6c2a7b8'


Trivial merge