merge of c50c1fd918a553b59bdd3a9a626161f6b7660928
authorRod Whitby <rod@whitby.id.au>
Fri, 15 Dec 2006 02:02:20 +0000 (02:02 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 15 Dec 2006 02:02:20 +0000 (02:02 +0000)
     and f76c23f2cb838ac81c84ddccaa99800c570cb6de


Trivial merge