merge of '9f8dec37506722f0949550fe1cb9c966bcac3ffc'
authorRod Whitby <rod@whitby.id.au>
Mon, 21 May 2007 11:39:29 +0000 (11:39 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 21 May 2007 11:39:29 +0000 (11:39 +0000)
     and 'd7b4e8f0922d96a2e6925c4de33ef16e6ce376f0'


Trivial merge