merge of '3524b1de858df7cc6c88667817fb70332cf4b03e'
authorRod Whitby <rod@whitby.id.au>
Fri, 25 May 2007 04:13:34 +0000 (04:13 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 25 May 2007 04:13:34 +0000 (04:13 +0000)
     and 'cb41a381e7a0c491e5968be15cd985dc75d92aaf'


Trivial merge