Merge branch 'CMSSW_6_2_X_SLHC'

Conflicts:
.gitignore