merge of '4a47675ba44186490e7922a2cf7a5d1385cb2a82'
authorRod Whitby <rod@whitby.id.au>
Thu, 22 Mar 2007 01:37:21 +0000 (01:37 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 22 Mar 2007 01:37:21 +0000 (01:37 +0000)
     and '76f379743d0f947433f4b0c862f4b20a0d3d1867'


Trivial merge