jtg
Port changes from CVS HEAD.
Merge pull request #570 from alja/from-CMSSW_7_0_0_pre2

Port changes from CVS HEAD to 7_0_X