Merge branch 'collectd-4.5'

diff --cc configure.in
Simple merge

diff --cc src/Makefile.am
Simple merge

diff --cc src/filecount.c
Simple merge

diff --cc src/libiptc/Makefile.am
index 3a6ef67,ffa9887..a8ed93c
--- 1/src/libiptc/Makefile.am
--- 2/src/libiptc/Makefile.am
+++ b/src/libiptc/Makefile.am
@@@ -8,7 -8,8 +8,8 @@@ endi
  
  noinst_LTLIBRARIES = libiptc.la
  
 -libiptc_la_CFLAGS = -DIPTABLES_VERSION=\"1.4.0\" -I$(KERNEL_DIR)/include
 +libiptc_la_CFLAGS = -I$(KERNEL_DIR)/include
  libiptc_la_SOURCES = libip4tc.c libip6tc.c \
-               ipt_kernel_headers.h libip6tc.h libiptc.h linux_list.h
+               ipt_kernel_headers.h libip6tc.h libiptc.h linux_list.h \
+               xtables.h libxtc.h
  

diff --cc src/perl.c
Simple merge