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

[nathans]

commit d7d2d98436fe073a54dfe8d5a3c9a30b9bb7fa1e
Merge: b662c8b 1033a68
Author: Nathan Scott <nathans at redhat.com>
Date:   Wed Jan 29 12:51:48 2014 +1100

    Merge branch 'master' into el6

 .gitignore |    1 +
 pcp.spec   |    7 ++++++-
 sources    |    2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)
---