removed cfi replaced by filldescription
Merge pull request #1131 from wmtan/MissingVirtualDestructor

ROOT 6 -- Missing virtual destructor in CondFormats/L1TObjects
Changed beginStream of stream module to take StreamID

Marco Rovere requested stream modules be able to know the StreamID to which they are associated. This is needed for the new DQM design.
Merge pull request #1123 from Dr15Jones/useConstStaticForHistoryAppender

Thread safety -- Change empty ProcessHistory static to const static
Merge pull request #1109 from mtosi/from-CMSSW_7_0_0_pre6_calib4grin

GRIN -- calibration 4 grin
Merge pull request #1087 from VinInn/KineFit

Recp updates -- Kine fit
Merge pull request #1097 from VinInn/PixelVertex

Reco updates -- Pixel vertex
Merge pull request #1127 from Dr15Jones/useAtomicForSanityCheck

Multithreaded fixes -- Fix threading problem with JetIDHelper
Merge pull request #1130 from veelken/veelken-isolation-for-boosted-taus2

Analysis updates -- Add isolation for electrons and muons from "boosted" tau -> e and tau ->...
Merge pull request #1122 from Dr15Jones/changeToConstStatic

Thread safety fixes -- Changed static to static const to avoid complaints from the thread-safety checker
consolidation of sources and outputs for fbevf
modified fed1023
Merge pull request #1090 from lgray/bugfix_mustache_params

Reco fix -- Merge in missing updates to mustache parameters
Merge pull request #1069 from alja/CMSSW_7_0_X

Fireworks fixes -- Fixes in Firewors/Core in data-compatibility check, item accessors, and interface to projection center.
add forgotten source
Add missing assert.
Merge pull request #961 from ktf/add-missing-asserts

Misc fixes -- Add missing assert.
one more forgotten
Merge pull request #1121 from cbaus/hijing-iteration-fix

Generator fixes -- hijing: restricted loop to stay in matrix dimension boundaries.
Merge pull request #1132 from wmtan/ROOT6NestedStructMustBePublicRedux2

ROOT6 -- Root6 cannot create dictionary for nested private structs (yet again)