pcp

Merge branch 'master' of /home/mgoodwin/src/pcp-kenj into dev
Resolved conflicts listed below - bump to 3.0.0-7

Conflicts:
CHANGELOG
VERSION.pcp
src/pmcd/rc_pcp
src/pmie/rc_pmie
src/pmproxy/rc_pmproxy

Changes to be committed:
(use "git reset HEAD ..." to unstage)

modified:   CHANGELOG
modified:   VERSION.pcp
modified:   build/mac/installer-resources/background.jpg
modified:   build/rpm/pcp.spec.in
modified:   build/rpm/pcp_fedora.spec
modified:   configure.in
modified:   debian/changelog
modified:   debian/control
modified:   man/man1/newhelp.1
modified:   man/man1/pmcd.1
modified:   man/man3/pmda.3
new file:   man/man3/pmdachildren.3
modified:   man/man3/pmdamain.3
new file:   man/man3/pmdaname.3
new file:   man/man3/pmdapmid.3
modified:   man/man4/pmns.4
modified:   src/cpan/PMDA/PMDA.xs
modified:   src/dbpmda/src/dbpmda.c
modified:   src/dbpmda/src/dbpmda.h
modified:   src/dbpmda/src/dso.c
modified:   src/dbpmda/src/gram.y
modified:   src/dbpmda/src/lex.l
modified:   src/dbpmda/src/pmda.c
modified:   src/dbpmda/src/util.c
modified:   src/genpmda/genpmda
modified:   src/include/impl.h
modified:   src/include/pmda.h
modified:   src/libpcp/src/desc.c
modified:   src/libpcp/src/fetchlocal.c
modified:   src/libpcp/src/help.c
modified:   src/libpcp/src/instance.c
modified:   src/libpcp/src/p_pmns.c
modified:   src/libpcp/src/pmns.c
modified:   src/libpcp/src/store.c
modified:   src/libpcp/src/util.c
modified:   src/libpcp_gui/src/GNUmakefile
modified:   src/libpcp_gui/src/timeclient.c
modified:   src/libpcp_pmda/src/callback.c
modified:   src/libpcp_pmda/src/help.c
modified:   src/libpcp_pmda/src/libdefs.h
modified:   src/libpcp_pmda/src/mainloop.c
modified:   src/libpcp_pmda/src/open.c
modified:   src/newhelp/chkhelp.c
modified:   src/newhelp/newhelp.c
modified:   src/pmcd/pmdaproc.sh
modified:   src/pmcd/rc_pcp
modified:   src/pmcd/src/dofetch.c
modified:   src/pmcd/src/dopdus.c
modified:   src/pmcd/src/dostore.c
modified:   src/pmcd/src/pmcd.h
modified:   src/pmdas/mmv/mmv.c
modified:   src/pmdas/pmcd/src/pmcd.c
modified:   src/pmdas/sample/help
modified:   src/pmdas/sample/pmns
modified:   src/pmdas/sample/src/pmda.c
modified:   src/pmdas/sample/src/sample.c
modified:   src/pmdas/windows/fetch.c
modified:   src/pmdas/windows/libpdh.h
modified:   src/pmdas/windows/open.c
modified:   src/pmdas/windows/pmda.c
modified:   src/pmie/rc_pmie
modified:   src/pmns/Make.stdpmid
modified:   src/pmns/ReplacePmnsSubtree
modified:   src/pmns/pmnsutil.c
modified:   src/pmns/stdpmid.pcp
modified:   src/pmproxy/rc_pmproxy

Signed-off-by: Mark Goodwin mgoodwin@redhat.com