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

[Dave Brolley]

commit fb860ceb0d2f2447a6f358d918c4dd3972582837
Merge: d8cea85 56f343e
Author: Dave Brolley <brolley at redhat.com>
Date:   Tue Apr 15 15:27:36 2014 -0400

    Merge branch 'master' into el5
    
    Conflicts:
    	pcp.spec

 .gitignore |    1 +
 pcp.spec   |   45 ++++++++++++++++++++++++++-------------------
 sources    |    2 +-
 3 files changed, 28 insertions(+), 20 deletions(-)
---
diff --cc pcp.spec
index 65b1bf9,09d86a5..b1ec0ca
--- a/pcp.spec
+++ b/pcp.spec
@@@ -721,8 -718,10 +721,15 @@@ chmod 644 "$PCP_PMNS_DIR/.NeedRebuild
  %defattr(-,root,root)
  
  %changelog
++<<<<<<< HEAD
 +* Sun Mar 23 2014 Frank Ch. Eigler <fche at redhat.com> - 3.9.1-2
 +- RHEL5 check-statics build fix
++=======
+ * Tue Apr 15 2014 Dave Brolley <brolley at redhat.com> - 3.9.2-1
+ - Improve pmdarpm(1) concurrency complications (BZ 1044297)
+ - Fix pmconfig(1) shell output string quoting (BZ 1085401)
+ - Update to latest PCP sources.
++>>>>>>> master
  
  * Wed Mar 19 2014 Nathan Scott <nathans at redhat.com> - 3.9.1-1
  - Update to latest PCP sources.