cms-sw/cmssw — pull request #4105 by ktf (2014-06-03 19:48:40+00:00)
Title: Cleanup #4004

As discussed, this corrects the behavior of #4004 getting back the old behavior and still keeping clang happy.