Merge branch 'collectd-4.1' into collectd-4.2

Conflicts:

	ChangeLog

diff --cc ChangeLog
index d488f6118ad02dd74d6f0ee020852cd561c39a9c,9660cf0b7a6b7235dd0b92dea5a1d66f0791c5df..b9e9fb6d3c45c1102e3af2eaf70d85d132e3e1db
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,48 -1,4 +1,48 @@@
- 2008-12-11, Version 4.1.6
 +2007-12-28, Version 4.2.3
 +      * sensors plugin: Updated the plugin to build and work with version 3
 +        of the libsensors library.
 +
 +2007-12-15, Version 4.2.2
 +      * nginx plugin: Incorrect comparison of strings lead to a segfault
 +        when using the plugin. Thanks to Saulius Grigaliunas for fixing
 +        this.
 +      * logfile plugin: The config option `Timestamp' was handled
 +        incorrectly and basically always active. Thanks to Luke Heberling
 +        for fixing this.
 +
 +2007-11-08, Version 4.2.1
 +      * tcpconns plugin: Don't complain about a missing file if IPv6 is not
 +        enabled on the host.
 +      * snmp plugin: Fix a memory leak.
 +
 +2007-10-27, Version 4.2.0
 +      * collectd: The new config option `Include' lets you include other
 +        configfiles and thus split up your config into smaller parts. This
 +        may be especially interesting for the snmp plugin to keep the data
 +        definitions separate from the host definitions.
 +      * ipvs plugin: The new `ipvs' plugin collects IPVS connection statistics
 +        (number of connections, octets and packets for each service and
 +        destination). Thanks to Sebastian Harl for this plugin.
 +      * memcached plugin: The new `memcached' plugin connects to a memcached
 +        daemon process and collects statistics of this distributed caching
 +        system. Thanks to Antony Dovgal for contributing this plugin.
 +      * nginx plugin: The new `nginx' plugin reads the status page of an
 +        nginx daemon and saves the handled connections and requests.
 +      * perl plugin: Many changes, including the added `EnableDebugger'
 +        config option which lets you debug your Perl plugins more easily.
 +      * rrdtool plugin: Use the thread-safe RRD-library if available. Try to
 +        be more thread-safe otherwise by locking calls to the library.
 +      * snmp plugin: Added the options `Scale' and `Shift' to Data-blocks to
 +        correct the values returned by SNMP-agents. If a <data> block is
 +        defined as `table' the instance is now optional. The sequence number
 +        is used as the type-instance in this case. The new `InstancePrefix'
 +        option allows to add arbitrary prefixes to the type-instance.
 +      * tcpconns plugin: The new `tcpconns' plugin collects the number of
 +        certain TCP connections and what state they're in. This can be used
 +        to see how many connections your FTP server has to handle or how
 +        many outgoing connections your mailserver has open.
 +
+ 2008-01-11, Version 4.1.6
        * unixsock plugin: A bug in the unixsock plugin caused it not to set
          the permission on the socket as documented in the manpage. Thanks to
          Evgeny Chukreev for fixing this issue.