SpamFilter/Captcha: merge from SpamFilter main branch, upto r8330.
Authored by: cboos 2009-06-28
Parent: [r8330]
Child: [r8332]