Merge branch 'collectd-4.1'

diff --cc ChangeLog
index 74d2a0a,3f16c8e..259f40c
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,7 +1,11 @@@
 +yyyy-mm-dd, Version 4.2.0
 +      * snmp plugin: Added the options `Scale' and `Shift' to Data-blocks to
 +        correct the values returned by SNMP-agents.
 +
  yyyy-mm-dd, Version 4.1.2
        * apcups plugin: Fix reporting of the `load percent' data.
+       * netlink plugin: Build issues under some older versions of the Linux
+         includes (i. e. Debian Sarge) have been fixed.
  
  2007-09-12, Version 4.1.1
        * Build system: The detection of `libnetlink' has been improved.