merge of 04e2b1d31e319303e9ffe6290c649f8c0cbdb552
authorRod Whitby <rod@whitby.id.au>
Fri, 8 Dec 2006 10:46:58 +0000 (10:46 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 8 Dec 2006 10:46:58 +0000 (10:46 +0000)
     and 9d544440ad5826495799ed73712a07f1beede37b


Trivial merge