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

[Mark Goodwin]

commit 4089f09dcc6998d4df6ec5b9664e7f3f40acd97d
Merge: 52027a6 03b076a
Author: Mark Goodwin <mgoodwin at redhat.com>
Date:   Thu Aug 16 16:24:17 2012 +1000

    Merge branch 'master' into el5

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