Merge branch 'gem-sw/CMSSW_6_2_X_SLHC' into merge-attempt
Merge branch 'gem-sim-validation' of github.com:geonmo/cmssw into CMSSW_6_2_X_SLHC