Summary of changes: 9580e1b... Correct the papi_disable macro for older pcp builds (*) 3bbc1a0... Merge branch 'master' into el5 (*) This commit already existed in another branch; no separate mail sent