spam-filter: merge with [source:trunk@...]
Authored by: mgood 2006-01-05
Parent: [r2732]
Child: [r2734]