merge of 21e3aea015b4542ed27eb6230a8fba2f1c9b9889
authorRod Whitby <rod@whitby.id.au>
Mon, 28 Aug 2006 20:46:54 +0000 (20:46 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 28 Aug 2006 20:46:54 +0000 (20:46 +0000)
     and 66118fcaf02332902350af917b57b972df319ac9


Trivial merge