merge of 0c6d0887b83f5cfd506da4e77d3431832c49a46b
authorRod Whitby <rod@whitby.id.au>
Thu, 14 Dec 2006 15:18:38 +0000 (15:18 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 14 Dec 2006 15:18:38 +0000 (15:18 +0000)
     and 40da8c329d334d7ca4306f4b2789fe63e92ae52b


Trivial merge