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

[nathans]

commit 9123f8fc817900e0128492120a8580c14a83f67c
Merge: 42ab3e3 269645d
Author: Nathan Scott <nathans at redhat.com>
Date:   Fri Sep 14 21:54:50 2012 +1000

    Merge branch 'master' into el6

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