Merge branch 'collectd-3.11'

Conflicts:

	ChangeLog

diff --cc ChangeLog
index 66c1fc1,b97383b..5fac3d6
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,7 +1,10 @@@
 +      * apache plugin: Support for lighttpd's `BusyServers' (aka.
 +      connections) field was added by Florent Monbillard.
 +
+ 2007-03-30, Version 3.11.3
+       * configure: Have the configure-script define `HAVE_LIBKSTAT' instead
+         of the unused `COLLECT_KSTAT'.
+ 
  2007-02-11, Version 3.11.2
        * plugin: Catch NULL-pointer and try to fix them. Otherwise the
          NULL-pointer may have been passed to `printf' which causes a

diff --cc configure.in
Simple merge