merge of 6ce9c06fa542384448ecabdf74e9dea219c9fd1a
authorRod Whitby <rod@whitby.id.au>
Sat, 16 Dec 2006 17:32:43 +0000 (17:32 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 16 Dec 2006 17:32:43 +0000 (17:32 +0000)
     and 75407fa582d548326d93f4db2345cb594d10e416


Trivial merge