merge of 469f1eb1ad527334a8c5f9143e791be88ede9109
authorRod Whitby <rod@whitby.id.au>
Mon, 25 Dec 2006 11:02:09 +0000 (11:02 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 25 Dec 2006 11:02:09 +0000 (11:02 +0000)
     and ece1da3b26b2e74ff0f8c01bf13b7840562b6d55


Trivial merge