Trivial change.
Merge pull request #756 from ktf/trivial-change

Trivial change.
Merge pull request #762 from cms-sw/IB/CMSSW_7_1_X/stable

Forward port IB/CMSSW_7_1_X/stable into IB/CMSSW_7_1_X/root5