Merge pull request #90 from cms-sw/CMSSW_6_2_X_SLHC

Cmssw 6 2 x slhc