Merge branch 'from-CMSSW_6_2_0_SLHC10'
Merge pull request #116 from jshlee/from-CMSSW_6_2_0_SLHC10

From cmssw 6 2 0 slhc10
Merge pull request #117 from jshlee/from-CMSSW_6_2_0_SLHC9

From cmssw 6 2 0 slhc9