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

[Mark Goodwin]

commit 983d8c68e5ce7d0bd5039310daa5a66cedbeb9d0
Merge: f5f32ca 85c6a1b
Author: Mark Goodwin <mgoodwin at redhat.com>
Date:   Fri Jun 22 13:18:50 2012 +1000

    Merge branch 'master' into el6

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