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

[nathans]

commit 1d362e6bafd8a4e76372766f5c5d1d9623de75a5
Merge: 34ffd0e 507e1a2
Author: Nathan Scott <nathans at redhat.com>
Date:   Tue May 14 16:38:41 2013 +1000

    Merge branch 'master' into el6

 .gitignore |    1 +
 pcp.spec   |   28 ++++++++++++++++++++++++----
 sources    |    2 +-
 3 files changed, 26 insertions(+), 5 deletions(-)
---