pcp updates - merge fix up

[Ken McDonell <kenj@xxxxxxxxxxxxxxxx>]

Need this one with the last batch I sent.

Changes committed to git://oss.sgi.com/kenj/pcp.git dev

 src/libpcp/src/auxconnect.c |    2 +-
 1 files changed, 2 insertions(+), 2 deletions(-)

commit ed63cb4d85b35f9d35b711f2ce2b2695e046c327
Merge: be5b890 04eb96d
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date:   Thu Jan 9 07:37:12 2014 +1100

    Merge branch 'dev' of git://oss.sgi.com/pcp/pcp into dev

    Conflicts:
        src/libpcp/src/auxconnect.c

    My version wins this time.