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

[nathans]

commit e00e99b127e9c1a3a5b2db0972a60551aa0cc44f
Merge: b918b2c 507e1a2
Author: Nathan Scott <nathans at redhat.com>
Date:   Tue May 14 16:38:46 2013 +1000

    Merge branch 'master' into el5

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