merge of '5c7330ec43644078393961a8eb84648b758ec953'
authorRod Whitby <rod@whitby.id.au>
Wed, 21 Mar 2007 11:46:01 +0000 (11:46 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 21 Mar 2007 11:46:01 +0000 (11:46 +0000)
     and 'a2feb55d5703de5d580f9a019866a69764257a81'


Trivial merge