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

[nathans]

commit 0a086c941743bd49928270fa2b55a50cdab3cc0a
Merge: b60650b 9c51c11
Author: Nathan Scott <nathans at redhat.com>
Date:   Thu May 15 15:34:55 2014 +1000

    Merge branch 'master' into f20

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