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