stuff from cvs repo
basic cvs ignore
from sync with cvs
merge conflict
check
more rebase conflicts
Merge branch 'lgray_work' of github.com:lgray/L1TriggerDPGUpgrade into lgray_work