merge of '4567013523400a8e89a74ec7813771456b7ffb5f'
authorRod Whitby <rod@whitby.id.au>
Wed, 6 Jun 2007 10:57:51 +0000 (10:57 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 6 Jun 2007 10:57:51 +0000 (10:57 +0000)
     and 'da99b108ae9f4e870b88f462ead9e47a3061c730'


Trivial merge