cms-sw/cmssw — pull request #950 by civanch (2013-09-30 18:22:03+00:00)
Title: 948

There was a conflict, whihc is resolved.