pcp updates: nssmerge branch spring cleaning

[Nathan Scott <nathans@xxxxxxxxxx>]

Changes committed to git://oss.sgi.com/pcp/pcp.git nssmerge

 src/include/pcp.conf.in               |   12 ------------
 src/perl/LogImport/Makefile.PL        |    2 +-
 src/perl/PMDA/Makefile.PL             |    2 +-
 src/pmdas/simple/GNUmakefile          |    4 ++--
 src/pmdas/simple/GNUmakefile.install  |    3 +--
 src/pmdas/trace/Makefile.proto        |    2 +-
 src/pmdas/trivial/GNUmakefile         |    4 ++--
 src/pmdas/trivial/GNUmakefile.install |    1 -
 src/pmdas/txmon/GNUmakefile           |    4 ++--
 src/pmdas/txmon/GNUmakefile.install   |    3 +--
 10 files changed, 11 insertions(+), 26 deletions(-)

commit d191ce86120a35c41e72865d33cbcdcce5bdc72c
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date:   Fri Nov 9 09:07:13 2012 +1100

    Cleanup a few leftover NSS/NSPR include directives