merge of '23f121db6a29e326e67b8bc67c0970d269187643'
authorRod Whitby <rod@whitby.id.au>
Thu, 5 Apr 2007 06:59:39 +0000 (06:59 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 5 Apr 2007 06:59:39 +0000 (06:59 +0000)
     and '7c4e06c6459b1ff003455d4784319cbc0c6ac2ff'


Trivial merge