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

[nathans]

commit 7c9b516782d1add519aaf8308c90c05602e93431
Merge: cbeeb71 fb06024
Author: Nathan Scott <nathans at redhat.com>
Date:   Tue Mar 26 09:54:00 2013 +1100

    Merge branch 'master' into el5

 pcp.spec |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---