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

[nathans]

commit 049731523a45cb839fa5a2b8fa02d56eaee9cc05
Merge: 280536e 5de00dd
Author: Nathan Scott <nathans at redhat.com>
Date:   Sun Oct 14 11:13:47 2012 +1100

    Merge branch 'master' into el5

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