Revision 6050

Author:	jgarnett
Date:	2004-05-23
Message:	merge resources into main