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

[nathans]

commit 00c6596422c355556ecc9ae1feccb11ef56cad7e
Merge: 4bf18d8 dcf4b3b
Author: Nathan Scott <nathans at redhat.com>
Date:   Thu Dec 12 16:07:06 2013 +1100

    Merge branch 'master' into el6

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