merge of 9f17bb47e7899a5664c31edd5c6e25de8b4ef19f
authorRod Whitby <rod@whitby.id.au>
Fri, 15 Dec 2006 05:47:24 +0000 (05:47 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 15 Dec 2006 05:47:24 +0000 (05:47 +0000)
     and b9b45bf7b9d31aacbebec45402ce946c76e6c620


Trivial merge