merge of '495972572e3314f7dbb0b97d3acfdd0cbebc48eb'
authorRod Whitby <rod@whitby.id.au>
Tue, 3 Apr 2007 00:02:10 +0000 (00:02 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 3 Apr 2007 00:02:10 +0000 (00:02 +0000)
     and 'af585eaf4c971b8d572ec4d7df0e1d8812690395'


Trivial merge