merge of f1d7476860f569e3fa2e97db12daf5c4513332f8
authorRod Whitby <rod@whitby.id.au>
Mon, 11 Dec 2006 15:18:38 +0000 (15:18 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 11 Dec 2006 15:18:38 +0000 (15:18 +0000)
     and fc5123f58f239212f219acea3e4433f4379af386


Trivial merge