merge of '0c667a35be10770cb3368fea6703de654299e6a3'
authorRod Whitby <rod@whitby.id.au>
Thu, 7 Jun 2007 09:48:01 +0000 (09:48 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 7 Jun 2007 09:48:01 +0000 (09:48 +0000)
     and '1ab663214c75f15191022cd0009603778fc2e828'


Trivial merge