pcp updates: resolve a merge botchlet

[Nathan Scott <nathans@xxxxxxxxxx>]

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

 src/libpcp/src/context.c |   17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

commit 961d23a631fb7f8045d1d3a10dd42620ccd7d7ef
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date:   Fri Sep 13 12:23:59 2013 +1000

    Rework the last commits around local context hostnames
    
    On reflection (not to mention the promise of two free patches,
    and a set of genuine corinthian steel steak knives), there's
    not really any point in using pmcd.hostname for local context,
    make this path go directly to gethostname.

commit 3fabc2fbb48f97baaa1d7a1fb95c837e94df9b45
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date:   Fri Sep 13 12:05:27 2013 +1000

    Resolve merge failure in libpcp hostname handling