Merge pull request #90 from cms-sw/CMSSW_6_2_X_SLHC

Cmssw 6 2 x slhc
Merge pull request #17 from gem-sw/cms-sw/CMSSW_6_2_X_SLHC

Merge pull request #90 from cms-sw/CMSSW_6_2_X_SLHC