[pcp/el6] (4 commits) ...Merge branch 'master' into el6

[nathans]

Summary of changes:

  6e7e35c... Remove s390 configure patch which has long been merged upst (*)
  7090275... Move configure step from prep to build section of spec (BZ  (*)
  40680c3... Correct the changelog entry from previous commit (thanks mg (*)
  42ab3e3... Merge branch 'master' into el6

(*) This commit already existed in another branch; no separate mail sent