merge of '3113cfe3acb79d8bce9b167f4840c404f744c7a4'
authorRod Whitby <rod@whitby.id.au>
Thu, 1 Feb 2007 02:17:28 +0000 (02:17 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 1 Feb 2007 02:17:28 +0000 (02:17 +0000)
     and 'da7c8d017a4154208fc087bae975d8058f6c2e6f'


Trivial merge