merge of 1222261ca62e414c7961ea346568199452af3ce8
authorRod Whitby <rod@whitby.id.au>
Mon, 1 Jan 2007 00:35:29 +0000 (00:35 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 1 Jan 2007 00:35:29 +0000 (00:35 +0000)
     and 827786b88875352fb85c4d47c8e72f29b73dea05


Trivial merge