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

[nathans]

commit 8c4ef84a4b49e76567cbab50c07cfde8ba4d0644
Merge: b8423e1 cf1a4f7
Author: Nathan Scott <nathans at redhat.com>
Date:   Wed Jul 31 12:41:06 2013 +1000

    Merge branch 'master' into el6

 .gitignore |    1 +
 pcp.spec   |   55 ++++++++++++++++++++++++++++++++++---------------------
 sources    |    2 +-
 3 files changed, 36 insertions(+), 22 deletions(-)
---