cms-sw/cmssw — pull request #3007 by apfeiffer1 (2014-03-25 09:16:08+00:00)
Title: Fix merge from71x

fixes merge issues from latest updates in 71x