commit 7a106771aeef9f101227844a9311e9ab6c6bfd51 Merge: 42ee5ae 40680c3 Author: Nathan Scott <nathans at redhat.com> Date: Wed Sep 5 14:46:22 2012 +1000 Merge branch 'master' into el5 pcp.spec | 7 +++++-- pcp_configure_s390x.patch | 12 ------------ sources | 3 +-- 3 files changed, 6 insertions(+), 16 deletions(-) ---