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

[Mark Goodwin]

commit 4eefb6df419cbd0b9929b847bf52f0a63e65c92c
Merge: f90cfb7 9e8a202
Author: Mark Goodwin <mgoodwin at redhat.com>
Date:   Thu Dec 15 15:31:45 2011 +1100

    Merge branch 'master' into el5

 .gitignore |    3 +++
 pcp.spec   |    8 +++++++-
 sources    |    4 +++-
 3 files changed, 13 insertions(+), 2 deletions(-)
---