merge of 'bfb00d07f52c7b9131c72ba2ccf74615ff161cac'
authorRod Whitby <rod@whitby.id.au>
Thu, 14 Jun 2007 10:24:19 +0000 (10:24 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 14 Jun 2007 10:24:19 +0000 (10:24 +0000)
     and 'fe92fd648b90fb22867f8ea1c1db92ba9e42b7c0'


Trivial merge