[Spambayes] merging tomorrow--big code changes

[Neale Pickett]

So then, Richie Hindle <richie@entrian.com> is all like:

> 1. X-Hammie-Disposition: Yes/No/Unsure          (ie. do nothing)
> 2. X-Spambayes-Classification: Spam/Ham/Unsure
> 3. X-Ham-Status: Yes/No/Unsure
> 
> Can we have a vote?

I like 2.  I got another message in private expressing support for 2.
Anyone else?