Merge branch 'collectd-4.2'

Conflicts:

	bindings/Makefile.am

diff --cc bindings/Makefile.am
index 45735722771da84483bc8ac17cbdf18e04a8c54a,16872e88e2159dd4b3db58cc72377a93ccc4f30d..1c604e191212f2ef160a0680ba09963d6c4e1508
--- 1/bindings/Makefile.am
--- 2/bindings/Makefile.am
+++ b/bindings/Makefile.am
@@@ -12,9 -11,16 +12,17 @@@ clean-local
  perl: perl/Makefile
        $(MAKE) -C perl
  
- perl/Makefile: perl/Makefile.PL perl/Collectd/Makefile.PL \
-               $(top_builddir)/config.status
 -perl/Makefile: .perl-directory-stamp perl/Makefile.PL perl/Collectd/Makefile.PL
++perl/Makefile: .perl-directory-stamp perl/Makefile.PL \
++      perl/Collectd/Makefile.PL $(top_builddir)/config.status
        cd perl && @PERL@ Makefile.PL PREFIX=$(prefix) @PERL_BINDINGS_OPTIONS@
  
+ .perl-directory-stamp:
+       if test ! -d perl; then \
+         mkdir -p perl/Collectd; \
+         cp $(srcdir)/perl/{Collectd.pm,Makefile.PL} perl/; \
+         cp $(srcdir)/perl/Collectd/{Unixsock.pm,Makefile.PL} perl/Collectd/; \
+       fi
+       touch $@
+ 
  .PHONY: perl
  

diff --cc src/Makefile.am
Simple merge

diff --cc src/network.c
Simple merge

diff --cc src/utils_avltree.c
Simple merge

diff --cc src/utils_avltree.h
index 0fc8ea15997dbe922994a4c73335a1da1d7ac895,5d35af116a5ef4f8c85f2abdadbfe951ab0af524..355ced2493b971112f8fcb17f560f4cbeb1b6393
--- 1/src/utils_avltree.h
--- 2/src/utils_avltree.h
+++ b/src/utils_avltree.h
@@@ -77,10 -74,10 +77,10 @@@ void c_avl_destroy (c_avl_tree_t *t)
   *   `value'    Value to be stored.
   *
   * RETURN VALUE
 - *   Zero upon success and non-zero upon failure and if the key is already
 - *   stored in the tree.
 + *   Zero upon success, non-zero otherwise. It's less than zero if an error
 + *   occurred or greater than zero if the key is already stored in the tree.
   */
- int avl_insert (avl_tree_t *t, void *key, void *value);
+ int c_avl_insert (c_avl_tree_t *t, void *key, void *value);
  
  /*
   * NAME