Merge pull request #91 from cms-sw/CMSSW_6_2_X_SLHC

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

sync to gem-sw
Merge branch 'gem/CMSSW_6_2_X_SLHC' into CMSSW_6_2_X_SLHC