- merge with Tai's changes
- removed cvs specific labels
- updated Jet MC smearing logic
Merge pull request #1472 from veelken/from-CMSSW_5_3_X_2013-11-08-1400

- merge with Tai's changes