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

[Mark Goodwin]

commit 0b3d9b6eaa107f049e8b97f94d7761862d620623
Merge: 608db1c 03b076a
Author: Mark Goodwin <mgoodwin at redhat.com>
Date:   Thu Aug 16 16:23:52 2012 +1000

    Merge branch 'master' into el6

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