Merge branch 'collectd-4.0'

Conflicts:

	ChangeLog

diff --cc ChangeLog
index e8881e6,d884654..fcccbf8
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,19 -1,13 +1,29 @@@
 +2007-07-21, 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 not sent along
 +        with the data itself over the network, so that the interval-settings
 +        of server and clients no longer needs to match.
 +      * 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-07-30, Version 4.0.6
+       * sensors plugin: Fix the ignorelist functionality: Only the `type
+         instance' was used to match against the list, but the documentation
+         told otherwise. This release fixes the code, so it complies with the
+         documentation.
+       * syslog plugin: Call `openlog' right when the plugin is loaded, so
+         configuration messages will end up in the logging facility.
+       * conrtib/fedora: The contributed specfile for Fedora has been
+         updated.
+ 
  2007-07-05, Version 4.0.5
        * Portability: More fixes for OpenBSD have been included.
  

diff --cc configure.in
Simple merge

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

diff --cc src/sensors.c
Simple merge