Enable clhep from externals.
Merge pull request #552 from degano/enable_clhep_71X

Enable clhep from externals.
Merge remote branch 'origin/IB/CMSSW_7_1_X/stable' into IB/CMSSW_7_0_X/stable
Data files for CalibTracker-SiPixelESProducers added in github cms-data.
Merge pull request #555 from degano/data_calibtracker_71X

Data files for CalibTracker-SiPixelESProducers added in github cms-data.
Merge remote branch 'origin/IB/CMSSW_7_1_X/stable' into IB/CMSSW_7_0_X/stable
Add data-RecoLocalCalo-EcalDeadChannelRecoveryAlgos and data-CondFormats-JetMETObjects.
Merge pull request #556 from degano/cmsswdata_71X

Add new data from github cms-data.
Merge remote branch 'origin/IB/CMSSW_7_1_X/stable' into IB/CMSSW_7_0_X/stable
Added CMSSW_6_2_X_SLHC for slc6_amd64_gcc472
Merge remote branch 'origin/IB/CMSSW_7_0_X/stable' into IB/CMSSW_7_0_X/stable
Merge remote branch 'origin/IB/CMSSW_7_1_X/stable' into IB/CMSSW_7_0_X/stable
Update config.map
Merge remote branch 'origin/IB/CMSSW_7_0_X/stable' into IB/CMSSW_7_0_X/stable
Merge remote branch 'origin/IB/CMSSW_7_1_X/stable' into IB/CMSSW_7_0_X/stable
resolve the conflict between stable and devel branch