merge of '874adfdd0660713eb95ed9ae86e0bd3fb95ec61a'
authorRod Whitby <rod@whitby.id.au>
Tue, 6 Feb 2007 08:45:07 +0000 (08:45 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 6 Feb 2007 08:45:07 +0000 (08:45 +0000)
     and '8ed317e67b9356de305928b5c3cfb03fa0cc9816'


Trivial merge