2001-09-06  Norman Walsh <nwalsh@users.sourceforge.net>

	* .cvsignore, prj.el: Merge V2-branch back onto the trunk; I'm abandoning V1-branch and V2-branch henceforth

2001-08-06  Norman Walsh <nwalsh@users.sourceforge.net>

	* .cvsignore: branches:  1.1.2;
	file .cvsignore was initially added on branch V2-branch.

	* .cvsignore, prj.el: New file.

	* prj.el: branches:  1.1.2;
	file prj.el was initially added on branch V2-branch.