merge of '931339025721c1ed37ba577e4e0f5ad191fe3568'
authorRod Whitby <rod@whitby.id.au>
Sat, 5 May 2007 00:53:23 +0000 (00:53 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 5 May 2007 00:53:23 +0000 (00:53 +0000)
     and 'f9d679b49c9ccfedc3565929011b677de9852036'


Trivial merge