merge of 0da211d2733480bc91dcce75cae6b2165b0c873f
authorRod Whitby <rod@whitby.id.au>
Fri, 29 Dec 2006 20:35:06 +0000 (20:35 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 29 Dec 2006 20:35:06 +0000 (20:35 +0000)
     and 8b3597c2174798b0e22b0c752ade70a447dd991a


Trivial merge