cms-sw/cmssw — pull request #6900 by wmtan (2014-12-13 14:56:49+00:00)
Title: Add lines dropped in bad git merge to fix massive compilation errors

The automatic git merge of pull request #6845 into CMSSW_7_4_ROOT6_X incorrectly dropped two lines of the change. The blank line dropped did not matter, but the other missing line caused massive compilation errors.
This pull request fixes the bad merge.
Please merge this obvious request as soon as convenient, but preferably in time for the next IB.