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

[Mark Goodwin]

commit f5f32ca9b9786cb14759c5052642d2cbdce149c5
Merge: 647d46b fd5f385
Author: Mark Goodwin <mgoodwin at redhat.com>
Date:   Wed May 2 22:50:49 2012 +1000

    Merge branch 'master' into el6

 .gitignore |    1 +
 pcp.spec   |   39 +++++++++++++++++++++++++++------------
 sources    |    4 +---
 3 files changed, 29 insertions(+), 15 deletions(-)
---