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

[Dave Brolley]

commit fd4db1ece8500384cc23554a32123c5de6088198
Merge: 7bb7b53 110429a
Author: Dave Brolley <brolley at redhat.com>
Date:   Wed Jun 18 12:59:20 2014 -0400

    Merge branch 'master' into f19

 .gitignore |    1 +
 pcp.spec   |   44 ++++++++++++++++++++++++++++++++++++++------
 sources    |    2 +-
 3 files changed, 40 insertions(+), 7 deletions(-)
---