merge of 697013ca4ccfd6d5f932b43fc1ac5c3dfa38776c
authorRod Whitby <rod@whitby.id.au>
Thu, 14 Dec 2006 04:32:01 +0000 (04:32 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 14 Dec 2006 04:32:01 +0000 (04:32 +0000)
     and ab4307bb43ca98194d8a249af907fb7532555b92


Trivial merge