Rebase of pull request #2990

Pull request #2990 won't merge into the main tree, even though I have no issues doing it locally.  I have no idea why, but I'll see if this works.  I just merged in #2990 and then rebased onto CMSSW_6_2_X_SLHC.  It was CMSSW_6_2_X_SLHC that I merged into so I don't think the rebase actually did anything.