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

[nathans]

commit fa9fef9b228737bac8118cc96cc89948a6e764e0
Merge: 116b46c f4e9924
Author: Nathan Scott <nathans at redhat.com>
Date:   Mon Mar 11 13:01:57 2013 +1100

    Merge branch 'master' into el5

 .gitignore             |    1 +
 init_script_race.patch |  313 ------------------------------------------------
 pcp.spec               |   82 ++++++++++---
 sources                |    2 +-
 4 files changed, 69 insertions(+), 329 deletions(-)
---