merge of '11eb8250bfa94e5d9ef52ed609d121a21f783e98'
authorRod Whitby <rod@whitby.id.au>
Sun, 3 Jun 2007 03:22:33 +0000 (03:22 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 3 Jun 2007 03:22:33 +0000 (03:22 +0000)
     and 'c6559ceba5987d7142c9759ae7f895632ac3b712'


Trivial merge