cms-sw/cmssw — pull request #2548 by wddgit (2014-02-19 22:22:16+00:00)
Title: Fix merge problem

Fix problem when 7_1_X was merged into 7_1_THREADED_X.
There was a conflict and some necessary changes were
not merged. This is causing compilation to fail in
7_1_THREADED_X.