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

[nathans]

commit 5d6a76c3df93df0c59fc0f19c9c82174627f780c
Merge: 6fdeab2 dadd642
Author: Nathan Scott <nathans at redhat.com>
Date:   Wed Mar 20 14:41:37 2013 +1100

    Merge branch 'master' into el6

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