cms-sw/cmssw — pull request #2576 by ktf (2014-02-21 10:13:32+00:00)
Title: Merge latest, greatest `CMSSW_6_2_X` into `CMSSW_6_2_X_SLHC` branch

The merge was done with:

```
git checkout CMSSW_6_2_X_SLHC
git merge -X ours CMSSW_6_2_X
```

This means the changes which are in the vanilla branch are picked up unless they are conflicting with those which entered the SLHC branch in the meanwhile. I also reverted `Configuration/AlCa/python/autoCond.py` as requested by @davidlange6. Once this is merged, I can enable the automatic merge of 62X into SLHC.