update
update
Merge pull request #17 from dildick/from-CMSSW_6_2_0_SLHC5

From cmssw 6 2 0 slhc5