Merge branch 'master' of git://oss.sgi.com/kenj/pcp
Conflicts: CHANGELOG VERSION.pcp src/pmcd/rc_pcp src/pmie/rc_pmie src/pmproxy/rc_pmproxy
Merge branch 'master' of git://oss.sgi.com/kenj/pcp
Conflicts:
CHANGELOG
VERSION.pcp
src/pmcd/rc_pcp
src/pmie/rc_pmie
src/pmproxy/rc_pmproxy