[pcp/f13: 5/5] Merge branch 'master' into f13

[Mark Goodwin]

commit 0330faff9e8315ef6ed2af60af7dee20c6f62e03
Merge: 3b9c7fa 85c6a1b
Author: Mark Goodwin <mgoodwin at redhat.com>
Date:   Fri Jun 22 13:18:59 2012 +1000

    Merge branch 'master' into f13

 .gitignore                |    1 +
 pcp.spec                  |   72 +++++++++++++++++++++++++--------------------
 pcp_configure_s390x.patch |   12 +++++++
 sources                   |    4 +--
 4 files changed, 54 insertions(+), 35 deletions(-)
---