Merge branch 'master' into ff/plugins-ng

Conflicts:

	src/collectd.c
	src/network.c

diff --cc configure.in
Simple merge

diff --cc src/Makefile.am
Simple merge

diff --cc src/collectd.c
index 6ffb7c3,a93cc28..e130647
--- 1/src/collectd.c
--- 2/src/collectd.c
+++ b/src/collectd.c
@@@ -222,9 -223,6 +222,8 @@@ static int start_client (void
  #if HAVE_LIBRRD
  static int start_server (void)
  {
-       /* FIXME use stack here! */
 +      /* FIXME */
 +#if 0
        char *host;
        char *type;
        char *instance;

diff --cc src/collectd.h
Simple merge

diff --cc src/network.c
Simple merge