Merge branch 'dev' of git://oss.sgi.com/mort/pcp into dev
Conflicts: src/pmdas/GNUmakefile Resolved: infiniband is removed, dtsrun is introduced.
Merge branch 'dev' of git://oss.sgi.com/mort/pcp into dev
Conflicts:
src/pmdas/GNUmakefile
Resolved: infiniband is removed, dtsrun is introduced.