SpamFilter/Captcha: merge from SpamFilter main branch
Authored by: cboos 2009-06-28
Parent: [r8326]
Child: [r8328]