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

[Mark Goodwin]

commit 020b538b969d2b73e0ea4de53ddd7c07ecdbda25
Merge: 0b3d9b6 cf1cd7d
Author: Mark Goodwin <mgoodwin at redhat.com>
Date:   Tue Aug 28 20:55:42 2012 +1000

    Merge branch 'master' into el6

 .gitignore |    1 +
 pcp.spec   |   72 ++++++++++++++++++++++++++++++++++++++++++++++++++----------
 sources    |    3 +-
 3 files changed, 63 insertions(+), 13 deletions(-)
---