master
remove unused parameters
Snapshot of CMSSW_6_2_0_pre8.
Removed _cfi files which were duplicates of ones in cfipython
Replace std::cout with edm::LogVerbatim in Geometry/HcalEventSetup and Geometry/HcalTestBeamData. Also add some missing files needed for testing
set MergePosition true only for collapse eras