Fixed a merge with Reid.  (I may have undone some things Reid did.)
Fixed a merge with Reid.  (I may have undone some things Reid did.)

SoftwareEngineeringToolDemos/FSE-2011-Crystal,KaranDagar/crystalvc,brunyuriy/crystalvc,KaranDagar/crystalvc,SoftwareEngineeringToolDemos/FSE-2011-Crystal,KaranDagar/FSE-2011-Crystal---old,SoftwareEngineeringToolDemos/FSE-2011-Crystal,KaranDagar/FSE-2011-Crystal---old,brunyuriy/crystalvc