Bug fixed:

Bug fixed:
Conflicts:
	src/Objects/DataExpress/eosRuby/src/Swig/molvieRuby_wrap.c
	src/Objects/DataExpress/gifFile/doc/gifFile.html
	src/Objects/DataExpress/openGL/doc/openGL.html
	src/Objects/DataExpress/psFile/doc/psFile.html
	src/Objects/DataManip/ctfInfo/doc/ctfInfo.html
	src/Objects/DataManip/llData/doc/llData.html
	src/Objects/DataManip/transform/doc/transform.html
	src/Objects/General/Matrix3D/doc/Matrix3D.html
	src/Objects/General/Vector/doc/Vector.html
	src/Tools/DCDFile/dcdAtomChangeDistanceFromAtom/src/dcdAtomChangeDistanceFromAtom.html
	src/Tools/DCDFile/dcdAtomDistanceDistribution/src/dcdAtomDistanceDistribution.html
	src/Tools/DCDFile/dcdFilePrint/src/dcdFilePrint.html
	src/Tools/DCDFile/dcdInfo/src/dcdInfo.html
	src/Tools/DCDFile/dcdSelectAtoms/src/dcdSelectAtoms.html
	src/Tools/DCDFile/dcdSerectAtom/src/dcdSerectAtom.html
	src/Tools/DCDFile/dcdTimeSeriesBehavior/src/dcdTimeSeriesBehavior.html
	src/Tools/Integration/Display2/src/Display2.html
	src/Tools/Integration/StereoDisplay/src/StereoDisplay.html
	src/Tools/database/homology2PG/src/homology2PG.html
	src/Tools/database/pgJournalSelect/src/pgJournalSelect.html
	src/Tools/database/pgSelect/src/pgSelect.html
	src/Tools/mrcImage/mrc2hdf/src/ALPHA
	src/Tools/mrcImage/mrc2hdf/src/ALPHALINUX
	src/Tools/mrcImage/mrc2hdf/src/ALPHALINUX5
	src/Tools/mrcImage/mrc2hdf/src/ALPHAOSF1
	src/Tools/mrcImage/mrc2hdf/src/HP
	src/Tools/mrcImage/mrc2hdf/src/I386LINUX
	src/Tools/mrcImage/mrc2hdf/src/SGI
	src/Tools/mrcImage/mrcImageDensityInfo/src/mrcImageDensityInfo.html
	src/Tools/mrcImage/mrcImageSphereCheck/src/mrcImageSphereCheck.html
	src/Tools/mrcImage/mrcImageSplit/src/mrcImageSplit.html
	src/Tools/mrcImage/mrcImageSuperResolution/src/mrcImageSuperResolution.html
	src/Tools/mrcImage/mrcImageVolumeCalc/src/mrcImageVolumeCalc.html
	src/Tools/mrcImage/mrcImageWindowing/src/mrcImageWindowing.html
	src/Tools/mrcImage/mrcSinogramFETsmoothParameterMatching/src/mrcSinogramFETsmoothParameterMatching.html
	src/Tools/pdbUtil/pdb2mrc2d/src/pdb2mrc2d.html
	src/Tools/pdbUtil/pdbChargeFit/src/pdbChargeFit.html
	src/Tools/pdbUtil/pdbCrystalCreate/src/pdbCrystalCreate.html
	src/Tools/pdbUtil/pdbHelix/src/pdbHelix.html
	src/Tools/pdbUtil/pdbMove/src/pdbMove.html
	src/Tools/pdbUtil/pdbPCA/src/pdbPCA.html
	src/Tools/pdbUtil/pdbRhoFit/src/pdbRhoFit.html
	src/Tools/pdbUtil/pdbRhoFitTm/src/pdbRhoFitTm.html
	src/Tools/pdbUtil/pdbShapeFit/src/pdbShapeFit.html
	src/Tools/pdbUtil/pdbTrans/src/pdbTrans.html
	src/Tools/pdbUtil/pdbTwoProteinFit/src/pdbTwoProteinFit.html
	src/Tools/rec3d/commonLinesSearchByVoting/src/commonLinesSearchByVoting.html