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

[nathans]

commit e38f3a56c7aa3dc7238965f730d05caa18f75471
Merge: 14a63ea 641ffe7
Author: Nathan Scott <nathans at redhat.com>
Date:   Wed Aug 13 15:50:23 2014 +1000

    Merge branch 'master' into el6

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