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

[nathans]

commit e2615f528185d79aa266b6a86d46bc8f38b68edf
Merge: 2b0b266 9c51c11
Author: Nathan Scott <nathans at redhat.com>
Date:   Thu May 15 15:41:04 2014 +1000

    Merge branch 'master' into el5

 .gitignore |    2 +
 pcp.spec   |  128 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------
 sources    |    2 +-
 3 files changed, 119 insertions(+), 13 deletions(-)
---