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

[nathans]

commit 3bbc1a0c3940b5483d4f923ecfd66f6f7c92d31f
Merge: 9d5f333 9580e1b
Author: Nathan Scott <nathans at redhat.com>
Date:   Mon Dec 1 16:03:06 2014 +1100

    Merge branch 'master' into el5

 pcp.spec |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
---