cms-sw/cmssw — pull request #3224 by apfeiffer1 (2014-04-05 08:05:29+00:00)
Title: catching up on missed auto-merged stuff from #3122

manually merged parts which got "ignored" by the auto-merge strategy for the BOOSTIO branch.
Please merge.