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

[Mark Goodwin]

commit 2e2a2d1b7f9ed41a838234ee0f9b5f773d898f68
Merge: 66c4e9a 85c6a1b
Author: Mark Goodwin <mgoodwin at redhat.com>
Date:   Fri Jun 22 13:18:42 2012 +1000

    Merge branch 'master' into el5

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