merge of '44c54209ef42574b28e953dcdf33228f818c8da7'
authorRod Whitby <rod@whitby.id.au>
Sat, 1 Dec 2007 14:20:17 +0000 (14:20 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 1 Dec 2007 14:20:17 +0000 (14:20 +0000)
     and '7ae6a85e45951bf75ee4d7b23b7c8dd7e0be1000'


Trivial merge