Merge branch 'collectd-4.1' into collectd-4.2

Conflicts:

	ChangeLog
	contrib/PerlLib/Collectd.pm
	version-gen.sh

diff --cc ChangeLog
index ca0b034ac7953adc1bfdda8d6e96cd642fecc511,269520c8a2df1a8532139b7b14b49728603fe890..526d463dedfc678d7b09e342f7ea1e7975447dd9
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,30 -1,13 +1,40 @@@
 +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.
 +
+ 2007-11-08, Version 4.1.4
+       * Build system: Improve detection of the rrd library, especially if
+         it's in a non-standard location.
+       * Build system: A bug when parsing the argument for
+         `--with-libnetsnmp' has been fixed.
+       * collectd: Implement `strerror_r' if the libc doesn't provide it.
+       * rrdtool plugin: Fix a bug in the shutdown sequence that might cause
+         a deadlock or delay when shutting down the daemon.
+       * snmp plugin: Fix a memory leak.
+ 
  2007-10-24, Version 4.1.3
        * collectd: A build issue under Solaris has been resolved by renaming
          data types.