cms-sw/cmssw — pull request #1472 by veelken (2013-11-15 10:07:10+00:00)
Title: - merge with Tai's changes

- removed cvs specific labels
- updated Jet MC smearing logic

For Volker and Tai: This version replaces pull request #1270