[pcp/el5: 5/5] Merge branch 'master' into el5

[Dave Brolley]

commit b861387474acbe94e750204fa7db5bac3b19bef7
Merge: 9699535 f068623
Author: Dave Brolley <brolley at redhat.com>
Date:   Fri Jan 23 22:22:28 2015 -0500

    Merge branch 'master' into el5

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