[pcp/el6: 3/3] Merge branch 'master' into el6

[nathans]

commit 19628440e12e2a9b5af8af585260f9470c26b5a0
Merge: f0ef872 9c51c11
Author: Nathan Scott <nathans at redhat.com>
Date:   Thu May 15 15:37:52 2014 +1000

    Merge branch 'master' into el6

 .gitignore |    2 +
 pcp.spec   |  119 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------
 sources    |    2 +-
 3 files changed, 111 insertions(+), 12 deletions(-)
---