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

[Mark Goodwin]

commit 4231d26c039b324ae29ff3cd2f1dbad41d0f73aa
Merge: fbe8a56 9e8a202
Author: Mark Goodwin <mgoodwin at redhat.com>
Date:   Thu Dec 15 15:30:50 2011 +1100

    Merge branch 'master' into el4

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