Update
Merge branch 'CMSSW_6_2_X_SLHC' of https://github.com/calabria/cmssw into CMSSW_6_2_X_SLHC