Merge branch 'calo-calib-2011-sim10' into 'Sim10/2011'
New Ecal and Hcal calibration for 2011 and 2010 sim10
See merge request !124 (merged)
(cherry picked from commit e63e6b1b)
f877cee8 new Ecal calibration for Sim10 with G4 9.6.p02 and EmOpt2 for 2010-2011 d6b13d19 new Hcal calibration for Sim10 with G4 9.6.p02 and EmOpt2 for 2010-2011