2000-11-07 Anna Marie Dirks <anna@helixcode.com>
	* Fixed cvs conflicts.

svn path=/trunk/; revision=6485