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

[Mark Goodwin]

commit 52027a6b0d203c6b4fe6feb670fb708912847407
Merge: 2e2a2d1 2dc466c
Author: Mark Goodwin <mgoodwin at redhat.com>
Date:   Thu Jul 19 16:18:05 2012 +1000

    Merge branch 'master' into el5

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