cms-sw/cmssw — pull request #3076 by bsunanda (2014-03-28 16:14:43+00:00)
Title: Phase2 shashlik07

Resolve conflict in buildfile