merge of 494b98d000774e0eb2a65f382c109b216b964df0
authorRod Whitby <rod@whitby.id.au>
Fri, 15 Dec 2006 20:02:39 +0000 (20:02 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 15 Dec 2006 20:02:39 +0000 (20:02 +0000)
     and ad717e9bb09280058ec1583b8b3675528cebabec


Trivial merge