cms-sw/cmssw — pull request #2400 by deguio (2014-02-11 15:14:16+00:00)
Title: Fix for elvine

this supersedes #2315