Merge branches 'dev' and 'ryan' into ryan
Merge branches 'dev' and 'ryan' into ryan
Initial version of nginx PMDA to provide metrics from stub_status module
nginx PMDA: Allow the timeout to be externalised in configuration file
nginx PMDA: Install a sample configuration file with commented out params
nginx PMDA: Fix typo in the comment
Merge branch 'ryan' of git://github.com/ryandoyle/pcp into dev
Build system updates for the nginx agent.

Add the new pmda into the build (src/pmdas SUBDIRS macro).
Correct the "make install" target for nginx config file, &
also add it to LSRCFILES macro.  Fix up a reference to an
undefined variable in the Install script.  Add nginx into
the list of optional PMDAs in QA.  Add .gitignore file for
nginx so man pages are culled.