cms-sw/cmssw — pull request #2804 by mark-grimes (2014-03-11 12:36:06+00:00)
Title: Pull request #2785 with merge conflicts resolved

Pull request #2785 had merge conflicts. Simple to resolve (extra space somewhere). I can only merge complete pull requests though, so had to create a new one.

@sviret please check this while I'm testing. You should be able to see the differences at https://github.com/mark-grimes/cmssw/compare/sviret:TrackFindingAM_SV_100314...merge2785?expand=1, but that shows thousands of differences presumably because TrackFindingAM_SV_100314 was based on a different branch.
The only changes should be a space removed from these two files:

L1Trigger/TrackFindingAM/test/AMFIT_test.py
L1Trigger/TrackFindingAM/test/AMPR_test.py