SpamFilter/Captcha: merged changes from SpamFilter main branch
Authored by: cboos 2009-06-27
Parent: [r8318]
Child: [r8320]