Merge pull request #1 from dildick/from-CMSSW_6_2_0_pre8

From cmssw 6 2 0 pre8
Merge pull request #2 from dildick/CMSSW_6_2_X

Cmssw 6 2 x