[pcp/el4: 3/3] Merge branch 'master' into el4

[Mark Goodwin]

commit 170155d8ea9d7cfae48ff3718b462d7e32a461d5
Merge: f76f285 85c6a1b
Author: Mark Goodwin <mgoodwin at redhat.com>
Date:   Fri Jun 22 13:18:30 2012 +1000

    Merge branch 'master' into el4

 pcp.spec                  |   33 +++++++++++++--------------------
 pcp_configure_s390x.patch |   12 ++++++++++++
 2 files changed, 25 insertions(+), 20 deletions(-)
---