[pcp/el5: 5/5] Merge branch 'master' into el5

[Dave Brolley]

commit 3b68f8176862744721d99778e4519cf5559a0227
Merge: 2b0b266 110429a
Author: Dave Brolley <brolley at redhat.com>
Date:   Wed Jun 18 13:01:55 2014 -0400

    Merge branch 'master' into el5

 .gitignore |    3 +
 pcp.spec   |  168 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------
 sources    |    2 +-
 3 files changed, 156 insertions(+), 17 deletions(-)
---