merge of '58ee0064f80d00d7772adc0a5d1103aad7affb32'
authorRod Whitby <rod@whitby.id.au>
Sun, 9 Sep 2007 00:08:06 +0000 (00:08 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 9 Sep 2007 00:08:06 +0000 (00:08 +0000)
     and 'daf8fa0ad9a599d77e90c1e38b8b2821a7aceab7'


Trivial merge