merge of '18d45ae122d3ca0b93e65c8b3dd5b5d599faa353'
authorRod Whitby <rod@whitby.id.au>
Wed, 29 Nov 2006 11:57:28 +0000 (11:57 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 29 Nov 2006 11:57:28 +0000 (11:57 +0000)
     and 'a052255457a42850dee32c7e42a8d43e98edf445'


Trivial merge