cms-sw/cmssw — pull request #2830 by wmtan (2014-03-12 20:29:52+00:00)
Title: Fix another git merge error

The ROOT6 IB CMSSW_7_1_ROOT6_X_2014-03-12-0200 had numerous compilation errors due to a git merge error in a header file that led to a missing declaration. That was fixed, but the corresponding definition in the source file was also dropped by git, now causing numerous link errors in ROOT6 IB CMSSW_7_1_ROOT6_X_2014-03-12-1400. This pull request adds the misisng chunk to the source file, thereby fixing most, if not all, of the link errors.
Please merge immediately.