Sarel Botha - 2010-11-06

Patch using 'cvs diff'