merge of 67bd39f2857c8d500ea6587f646708b1cf8072af
authorRod Whitby <rod@whitby.id.au>
Mon, 1 Jan 2007 02:32:26 +0000 (02:32 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 1 Jan 2007 02:32:26 +0000 (02:32 +0000)
     and c45af8aecda431cfd0b08ac44631f5066955303b


Trivial merge