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

[nathans]

commit d9cf2162a95ca7d259424c098b7099e175cd4523
Merge: f31a773 823babf
Author: Nathan Scott <nathans at redhat.com>
Date:   Fri Oct 18 09:55:45 2013 +1100

    Merge branch 'master' into el6

 .gitignore |    1 +
 pcp.spec   |   96 +++++++++++++++++++++++++++++++++++++++++------------------
 sources    |    2 +-
 3 files changed, 69 insertions(+), 30 deletions(-)
---