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

[Mark Goodwin]

commit 608db1c955253c445ca391f216695078cef25756
Merge: 983d8c6 2dc466c
Author: Mark Goodwin <mgoodwin at redhat.com>
Date:   Thu Jul 19 16:18:04 2012 +1000

    Merge branch 'master' into el6

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