gem-sw/cmssw — pull request #86 by geonmo (2014-02-26 07:11:46+00:00)
Title: Resolve conflict problem from official CMSSW_6_2_X_SLHC

Fix conflict commit.