Merge pull request #96 from ktf/IB/CMSSW_6_2_X/stable

Misc fixes for the git migration
Forgot to update the revision.