Merge pull request #126 from gem-sw/from-CMSSW_6_2_0_SLHC11

From cmssw 6 2 0 slhc11