merge of '8ee8881d5b5bf5ad5998774d3c0ce966a84a0abb'
authorRod Whitby <rod@whitby.id.au>
Sun, 1 Apr 2007 11:10:15 +0000 (11:10 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 1 Apr 2007 11:10:15 +0000 (11:10 +0000)
     and 'd41b95dc23a2abd9e172dbf3d9afcd3280005355'


Trivial merge