cms-sw/cmssw — pull request #2819 by wmtan (2014-03-12 06:13:21+00:00)
Title: Restore chunk lost in git merge error

When the latest changes in 7_1_X were merged into 7_1_ROOT6_X, one chunk of code in CondCore/ORA/interface/Object.h was mysteriously dropped, causing numerous (119) compilation errors.
This very urgent pull request restores the dropped chunk and fixes most, if not all, of the compilation errors.
Please merge immediately.