[Spambayes] gratuitous changes? + bugs

[Meyer, Tony]

[Tony]
> What do you have that calls mergefiles?  None of the scripts in cvs do
> (well, a search for "mergefiles" doesn't bring anything up). 

Well, so much for relying on XP's search.  HammieFilter does call
mergefiles.  I'm about to check in a fix for this.  Apologies that I
didn't find it earlier.  (This is an ugly way to do things, though;
HammieFilter shouldn't be calling mergefiles, that's what the Options
modules is for...)

=Tony Meyer