minor fixes for CMSSW_6_2_0
Merge branch 'master' of github.com:/scasasso/usercode