Merge branch 'ff/avl-tree'

diff --cc src/Makefile.am
index 58cd53ce629006b0df5ae573bea1f5e52786cd0c,e0838a1f81882889446620a15c5acae9ef32a24a..f4c5464ae80ab0835835faa485a4eec46e687a13
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -12,10 -11,11 +12,11 @@@ bin_PROGRAMS = collectd-nagio
  
  collectd_SOURCES = collectd.c collectd.h \
                   utils_debug.c utils_debug.h \
+                  utils_avltree.c utils_avltree.h \
                   utils_mount.c utils_mount.h \
 +                 utils_llist.c utils_llist.h \
                   utils_ignorelist.c utils_ignorelist.h \
                   common.c common.h \
 -                 network.c network.h \
                   plugin.c plugin.h \
                   configfile.c configfile.h
  collectd_CPPFLAGS = $(LTDLINCL)