merge of 97d5d65aa62ae96288856a5b7cec4213224021e2
authorRod Whitby <rod@whitby.id.au>
Thu, 21 Dec 2006 19:02:36 +0000 (19:02 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 21 Dec 2006 19:02:36 +0000 (19:02 +0000)
     and dab75b0063f1ebcf6efa7a60b26654b30c65dd68


Trivial merge