SpamFilter/Captcha: merge from SpamFilter main branch
Authored by: cboos 2009-06-27
Parent: [r8322]
Child: [r8324]