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

[Mark Goodwin]

commit c3efe594bcfd9b75c00fcb177f7e827320f22105
Merge: fd4db1e d0f4a70
Author: Mark Goodwin <mgoodwin at redhat.com>
Date:   Wed Jul 16 13:55:42 2014 +1000

    Merge branch 'master' into f19

 .gitignore |    1 +
 pcp.spec   |   10 +++++++++-
 sources    |    2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)
---