Auto-merge

From: David Abrahams (david.abrahams_at_[hidden])
Date: 2002-02-13 13:09:02

Done on the perforce_2_4_merge branch. Not all of these went so smoothly,
but it's a start. The files with no extension all presented a problem for
emacs for some reason, so nothing was done there.

Jambase
Jamfile
Makefile

I also ignored all of the files which are ultimately generated by
jamgram.yy.

-Dave

*---------------------------------------------------*
David Abrahams
C++ Booster (http://www.boost.org)
Pythonista (http://www.python.org)
resume: http://users.rcn.com/abrahams/resume.html
email: david.abrahams_at_[hidden]
*---------------------------------------------------*