Fixed for SLC6
Merge branch 'master' of github.com:cbeiraod/2l2v_fwk