Merge branch 'ff/aggregate'

Conflicts:
	src/Makefile.am

diff --cc configure.in
Simple merge

diff --cc src/Makefile.am
index 5bfe930,9d528c1..f4c699a
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -1393,7 -1395,15 +1403,20 @@@ install-exec-hook
        $(INSTALL) -m 0644 $(srcdir)/postgresql_default.conf \
                $(DESTDIR)$(pkgdatadir)/postgresql_default.conf;
  
 +uninstall-hook:
 +      rm -f $(DESTDIR)$(pkgdatadir)/types.db;
 +      rm -f $(DESTDIR)$(sysconfdir)/collectd.conf
 +      rm -f $(DESTDIR)$(pkgdatadir)/postgresql_default.conf;
++
+ if BUILD_FEATURE_DEBUG
+ bin_PROGRAMS += utils_vl_lookup_test
+ utils_vl_lookup_test_SOURCES = utils_vl_lookup_test.c \
+                                utils_vl_lookup.h utils_vl_lookup.c \
+                                utils_avltree.c utils_avltree.h \
+                                common.h
+ 
+ utils_vl_lookup_test_CPPFLAGS =  $(AM_CPPFLAGS) $(LTDLINCL) -DBUILD_TEST=1
+ utils_vl_lookup_test_CFLAGS = $(AM_CFLAGS)
+ utils_vl_lookup_test_LDFLAGS = -export-dynamic
+ utils_vl_lookup_test_LDADD =
+ endif

diff --cc src/collectd.conf.in
Simple merge

diff --cc src/collectd.conf.pod
Simple merge

diff --cc src/common.c
Simple merge