added CMSSW_7_2_THREADED_X
Merge remote branch 'origin/IB/CMSSW_7_0_X/stable' into IB/CMSSW_7_0_X/stable
Merge remote branch 'origin/IB/CMSSW_7_1_X/stable' into IB/CMSSW_7_0_X/stable
Add extra CUDA flags.

On Felice request, I forced code generation for the current nVidia
architecture. I assume in any case we will never use anything lower than
this, so I guess it's fine.
Merge pull request #737 from ktf/fix-cuda-options

Fix cuda options
Merge remote branch 'origin/IB/CMSSW_7_1_X/stable' into IB/CMSSW_7_0_X/stable
Move CMSSW_7_2_THREADED_X to next.
Merge remote branch 'origin/IB/CMSSW_7_0_X/stable' into IB/CMSSW_7_0_X/stable
Merge remote branch 'origin/IB/CMSSW_7_1_X/stable' into IB/CMSSW_7_0_X/stable
Merge branch 'IB/CMSSW_7_1_X/gcc490' of https://github.com/cms-sw/cmsdist into merge-upstream-20140603
Merge branch 'merge-upstream-20140603' into gcc490-port