cms-sw/cmssw — pull request #570 by alja (2013-08-19 19:12:16+00:00)
Title: Port changes from CVS HEAD

Port changes from CVS HEAD.