merge of 957619ab6af4bd3b1305b480c7392fb5be0c692c
authorRod Whitby <rod@whitby.id.au>
Wed, 13 Dec 2006 10:47:07 +0000 (10:47 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 13 Dec 2006 10:47:07 +0000 (10:47 +0000)
     and a7185dcabd44a4b6ad4fe458c117df084e761f2d


Trivial merge