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

[nathans]

commit b8423e143a375e67d1cc80f75f17907d97187c7f
Merge: 1d362e6 c8e9f68
Author: Nathan Scott <nathans at redhat.com>
Date:   Wed Jun 19 13:44:44 2013 +1000

    Merge branch 'master' into el6

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