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

[nathans]

commit 79f16a70999b359c22994c9671aae42474f1a609
Merge: e00e99b c8e9f68
Author: Nathan Scott <nathans at redhat.com>
Date:   Wed Jun 19 13:45:54 2013 +1000

    Merge branch 'master' into el5

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