Merge branch 'collectd-4.1'

Conflicts:

	ChangeLog
	contrib/PerlLib/Collectd.pm

diff --cc ChangeLog
index 8b0c1c8,a886801..5d9184c
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,22 -1,6 +1,24 @@@
- yyyy-mm-dd, Version 4.1.3
 +yyyy-mm-dd, 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 interresting for the snmp plugin to keep the data
 +        definitions seperate from the host definitions.
 +      * perl plugin: Many changes, including the added `EnableDebugger'
 +        config option which lets you debug your Perl plugins more easily.
 +      * snmp plugin: Added the options `Scale' and `Shift' to Data-blocks to
 +        correct the values returned by SNMP-agents.
 +      * ipvs plugin: The new `ipvs' plugin collects IPVS connection statistics
 +        (number of connections, octets and packets for each service and
 +        destination).
 +      * rrdtool plugin: Use the threadsafe RRD-library if available. Try to
 +        be more threadsafe otherwise by locking calls to the library.
 +      * 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.
 +
+ 2007-10-24, Version 4.1.3
+       * collectd: A build issue under Solaris has been resolved by renaming
+         data types.
        * rrdtool plugin: Use the threadsafe RRD-library if available. Try to
          be more threadsafe otherwise by locking calls to the library.