merge of '5f7251c79e318f961c3b87d5a6f9b6b40e0998f7'
authorRod Whitby <rod@whitby.id.au>
Thu, 1 Mar 2007 06:08:20 +0000 (06:08 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 1 Mar 2007 06:08:20 +0000 (06:08 +0000)
     and 'dd370e13186a72c61075beb8296b3418acfe5c67'


Trivial merge