merge of 337cfe2dd7c694a21c34148c5094a3ab6d4f6b8f
authorRod Whitby <rod@whitby.id.au>
Wed, 6 Sep 2006 19:31:32 +0000 (19:31 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 6 Sep 2006 19:31:32 +0000 (19:31 +0000)
     and ee12cb9ed2318aec0aa9342a44994a5027816c9d


Trivial merge