cms-sw/cmssw — pull request #4942 by wmtan (2014-08-13 19:43:23+00:00)
Title: Fix compilation error caused by merge error

Fix compilation error in DataFormats/Provenance caused by a git merge error in a carryover from the 7_2_X branch.
Pleaee merge as soon as feasible.