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

[nathans]

commit b918b2ca60ae44402b1d50c7b67848f625089532
Merge: 7c9b516 370760e
Author: Nathan Scott <nathans at redhat.com>
Date:   Fri Apr 19 17:09:28 2013 +1000

    Merge branch 'master' into el5

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