Merge branch 'collectd-4.1'

Conflicts:

	ChangeLog

diff --cc ChangeLog
index ac5e78c1abe116d8d608d058704cd1ea830320c5,099a5ca4272b50bb308ae866b949adfaa130ae24..24dc6908fd6a721530f8989d5f59e22fcc85f8da
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,15 -1,5 +1,21 @@@
 +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.
++
++yyyy-mm-dd, Version 4.1.3
+       * rrdtool plugin: Use the threadsafe RRD-library if available. Try to
+         be more threadsafe otherwise by locking calls to the library.
  
  2007-09-28, Version 4.1.2
        * apcups plugin: Fix reporting of the `load percent' data.

diff --cc README
Simple merge

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

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