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

[nathans]

commit 57ba9e8494b1a5ae0e14d9321d593a7515cb2713
Merge: c3efe59 641ffe7
Author: Nathan Scott <nathans at redhat.com>
Date:   Wed Aug 13 15:50:04 2014 +1000

    Merge branch 'master' into f19

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