merge of '0b31bda390691b7d9e15f77a2ea3e3705bbf2f12'
authorRod Whitby <rod@whitby.id.au>
Thu, 12 Apr 2007 23:58:10 +0000 (23:58 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 12 Apr 2007 23:58:10 +0000 (23:58 +0000)
     and '0c9c587dcc0862dfec12fe2f8a20fe0a88de65b1'


Trivial merge