cms-sw/cmssw — pull request #1975 by ktf (2014-01-09 13:13:59+00:00)
Title: Rebase without merges

Same as #1936, but without the merges.