[pcp/f20: 2/2] Merge branch 'master' into f20

[nathans]

commit c5c57e1c792d3fee3f981665ae69ead2d84a8428
Merge: b38927e 9db2edc
Author: Nathan Scott <nathans at redhat.com>
Date:   Fri Oct 31 16:36:08 2014 +1100

    Merge branch 'master' into f20

 .gitignore |    2 +
 pcp.spec   |  172 +++++++++++++++++++++++++++++++++++++++++++-----------------
 sources    |    3 +-
 3 files changed, 128 insertions(+), 49 deletions(-)
---