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

[nathans]

commit cbdfc7c4bed2850d9a64cb152b826f6ccafe91e3
Merge: 9123f8f 16e75eb
Author: Nathan Scott <nathans at redhat.com>
Date:   Fri Sep 14 22:26:00 2012 +1000

    Merge branch 'master' into el6

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