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

[nathans]

commit 04ad0f95932f7a637a5acef064a71bf107bee5ce
Merge: 0497315 5f1a981
Author: Nathan Scott <nathans at redhat.com>
Date:   Mon Nov 19 15:30:24 2012 +1100

    Merge branch 'master' into el5

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