> It's this section of spamassassin.raw:
This is what cvs puts in when you modify the copy of the file on your disk
and someone checks in a change and then you pull an update and cvs can't
figure out how to merge your changes and the checked in changes. The lines
between the <<<<<< and the ===== are in your file and the ones in the next
section are what have been checked in. You must have not noticed the warning
messages about conflicts that cvs gave you when you did the update, and the
"C" flag next to that file when cvs listed the files being pulled.

from localhost (localhost [127.0.0.1])
	by phobos.labs.netnoteinc.com (Postfix) with ESMTP id 9686143F9B
	for <zzzz@localhost>; Wed, 28 Aug 2002 08:03:48 -0400 (EDT)
from phobos [127.0.0.1]
	by localhost with IMAP (fetchmail-5.9.0)
	for zzzz@localhost (single-drop); Wed, 28 Aug 2002 13:03:48 +0100 (IST)
from n26.grp.scd.yahoo.com (n26.grp.scd.yahoo.com
    [66.218.66.82]) by dogma.slashnull.org (8.11.6/8.11.6) with SMTP id
    g7SC4OZ23062 for <zzzz@spamassassin.taint.org>; Wed, 28 Aug 2002 13:04:24 +0100
from unknown (HELO carbon) (194.73.73.92) by
    mta2.grp.scd.yahoo.com with SMTP; 28 Aug 2002 12:04:22 -0000
from host217-34-71-140.in-addr.btopenworld.com ([217.34.71.140])
    by carbon with esmtp (Exim 3.22 #8) id 17k1Yb-0001UI-00 for
    forteana@yahoogroups.com; Wed, 28 Aug 2002 13:04:22 +0100
from quoted-printable to 8bit by dogma.slashnull.org
    id g7SC4OZ23062
From timc@2ubh.com  Wed Aug 28 13:03:49 2002

No, hits=-3.6 required=7.0
	tests=EMAIL_ATTRIBUTION,FORGED_RCVD_TRAIL,KNOWN_MAILING_LIST,
	      REFERENCES,SPAM_PHRASE_00_01,USER_AGENT,X_ACCEPT_LANG
	version=2.50-cvs

Jim Whitehead wrote:
>Great, this is half of what I'd need to become Spider Man! Now all I need to
>figure out is how to do that spider web shooting thing.
>
Heheheh... So becomming a university professor was your second career
choice?  ;-)
Seriously though (or not, as the case may be), The Amazing Spiderman had
many other abilities to help him out. Most notable, perhaps, was his
'spidey strength' and 'spidey senses'. The strength to weight ratio of a
spider is so high that Spiderman is able to throw a bus several city
blocks with little effort. His endurance is similarly enhanced as well.
As for the spidey senses, well they're really great, but AFAIK not
really well explained in the comic series. Spiders have multiple eyes,
ears, noses and tongues which Peter Parker did not visibly have. There
have been a few attempts to explain his heightened reflexes, from the
biological to hidden methamphetamine use, but none seem to do the spidey
sense justice... I seem to recall Spiderman being able to detect the
presence of well concealed weapons and even sense evil-doers while they
were in their street clothes. Perhaps the spidey senses are the result
of some sort of quantum entanglement?
Elias