Merge branch 'fche/for-merge' of ../pcpfans into dev
Merge branch 'dev' of ssh://oss.sgi.com/oss/git/pcp/pcp into dev
Merge branch 'dev' of git://git.performancecopilot.org/kenj/pcp into dev
Merge branch 'dev' of ssh://oss.sgi.com/oss/git/pcp/pcp into dev
Initial papi pmda version

* src/pmdas/GNUmakefile - add papi pmda to build
* src/pmns/stdpmid.pcp - add papi as 126 to pmns
* src/pmdas/papi/* - papi pmda inital draft files
Initial papi pmda version

* src/pmdas/GNUmakefile - add papi pmda to build
* src/pmns/stdpmid.pcp - add papi as 126 to pmns
* src/pmdas/papi/* - papi pmda inital draft files
Added help and README documenation for the papi pmda

*README - basic readme file for papi pmda
*help 	- basic metric help statements
Merge branch 'lberk/papi' of ssh://sourceware.org/git/pcpfans into lberk/papi

Conflicts:
	src/pmdas/papi/README
	src/pmdas/papi/help
	src/pmns/stdpmid.pcp
Add current state of papi.c pmda

working on filtering out non-root requests for inrotmation
Merge branch 'dev' into scox/dev
Update to papi pmda

get contextAttributeCallBack working
Use python option processing class.

* pmatop.py (_Options): New class to process command options.
  Fix spacing and punctuation issues flagged by pylint.
* pmcollect.py: Likewise
Use python option processing class.

* pmcollectl.py: Remove debugging line.
Merge branch 'scox/dev' of git://sourceware.org/git/pcpfans into scox/dev
Merge branch 'dev' into scox/dev
Update papi pmda with root-only access and auto-adding counters

*src/pmdas/papi/GNUmakefile - Update to actually build the pmda and drop the perl/python stuff
*src/pmdas/papi/papi.c - only allow root uid's to access the pmda and change metric addition to eventset based on the individual clients connecting/disconnecting
Refactor setting event metric tracker

Instead of setting the ctxtab[context].tracker[i] var on every
fetch, set only it once in check_eventset.

*src/pmdas/papi/papi.c - refactor setting tracker var to check_eventset
Add PAPI_remove_event() calls for other metrics when client is disconnecting

*src/pmdas/papi/papi.c - add the PAPI_remove_event call switch statement for the
		         remainder of the metrics we track
Fix papi_remove_event functions

*src/pmdas/papi/papi.c - papi_remove_event takes a specific metric, not the values variable
Merge branch 'dev' into scox/dev