merge of de3589519154c78d05730da34ff01264b86a75af
authorRod Whitby <rod@whitby.id.au>
Tue, 12 Dec 2006 17:02:23 +0000 (17:02 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 12 Dec 2006 17:02:23 +0000 (17:02 +0000)
     and f2655d3a06fe0aa3dafbe4bb0a27ec97d4465a13


Trivial merge