Merge branch 'collectd-4.0' into collectd-4.1

Conflicts:

	ChangeLog

diff --cc ChangeLog
index 2c4cf09327a42a3b520b6c29d0903f818d3c70d5,7ca33c9eea606e7fda570a2492b4bcae0f299120..2e68d7929ca62f48fe23ad74e1023f473cb5d3a0
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,23 -1,6 +1,26 @@@
 +2007-09-01, Version 4.1.0
 +      * Build system: The build system has been changed to automatically
 +        disable all plugins, which are missing dependencies. The dependency
 +        checking has been removed from the plugins themselves to remove
 +        redundancy.
 +      * Flexible interval: The interval of collected data is now sent along
 +        with the data itself over the network, so that the interval-settings
 +        of server and clients no longer needs to match.
 +      * netlink plugin: The new `netlink' plugin connects to the Linux
 +        kernel using a netlink socket and uses it to query information about
 +        interfaces, qdiscs and classes.
 +      * rrdtool plugin: The cache is now dumped to disk in an extra thread
 +        to not block data collection.
 +      * snmp plugin: The new `snmp' plugin can read values from SNMP enabled
 +        network devices, such as switches, routers, thermometers, rack
 +        monitoring servers, etc. The collectd-snmp(5) manpage documents this
 +        plugin.
 +      * unixsock plugin: Added the `LISTVAL' command.
 +      * xmms plugin: The new `xmms' plugin graphs the bitrate and frequency
 +        of music played with xmms.
+ 2007-09-10, Version 4.0.8
+       * collectd: The `sstrerror' function was improved to work correctly
+         with the broken GNU version of `strerror_r'.
  
  2007-08-26, Version 4.0.7
        * documentation: Some typos have been fixed and some information has