Merge branch 'collectd-4.9' into collectd-4.10

Conflicts:
	ChangeLog
	version-gen.sh

diff --cc ChangeLog
index 75f5b1951e354a91d4722ac92b2ae76aa1c21255,da1ab0fc29e2a1249998aaeed80073491c6f9332..a74e1b154c636939108d3853b19a723497e75885
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,59 -1,27 +1,83 @@@
 +2010-05-01, Version 4.10.0
 +      * collectd: JSON output now includes the "dstypes" and "dsnames"
 +        fields. This makes it easier for external applications to interpret
 +        the data. Thanks to Chris Buben for his work.
 +      * collectd: The new "Timeout" option can be used to specify a
 +        "timeout" for missing values. This is used in the threshold checking
 +        code to detect missing values. Thanks to Andrés J. Díaz for the
 +        patch.
 +      * apache plugin: Support for "IdleWorkers" (Apache 1.*: "IdleServers")
 +        has been added.
 +      * curl plugin: The new "ExcludeRegex" allows to easily exclude certain
 +        lines from the match.
 +      * curl_xml plugin: This new plugin allows to read XML files using cURL
 +        and extract metrics included in the files. Thanks to Amit Gupta for
 +        his work.
 +      * filecount plugin: The new "IncludeHidden" option allows to include
 +        "hidden" files and directories in the statistics. Thanks to Vaclav
 +        Malek for the patch.
 +      * logfile plugin: The new "PrintSeverity" option allows to include the
 +        severity of a message in the output. Thanks to Clément Stenac for
 +        his patch.
 +      * memcachec plugin: The new "ExcludeRegex" allows to easily exclude
 +        certain lines from the match.
 +      * modbus plugin: This new plugin allows to read registers from
 +        Modbus-TCP enabled devices.
 +      * network plugin: The new "Interface" option allows to set the
 +        interface to be used for multicast and, if supported, unicast
 +        traffic. Thanks to Max Henkel for his work.
 +      * openvpn plugin: The "CollectUserCount" and "CollectIndividualUsers"
 +        options allow more detailed control over how to report sessions of
 +        multiple users. Thanks to Fabian Schuh for his work.
 +      * pinba plugin: This new plugin receives timing information from the
 +        Pinba PHP extension, which can be used for profiling PHP code and
 +        webserver performance. Thanks to Phoenix Kayo for his work.
 +      * ping plugin: The new "MaxMissed" allows to re-resolve a hosts
 +        address when it doesn't reply to a number of ping requests. Thanks
 +        to Stefan Völkel for the patch.
 +      * postgresql plugin: The "Interval" config option has been added. The
 +        plugin has been relicensed under the 2-clause BSD license. Thanks to
 +        Sebastian Harl for his work.
 +      * processes plugin: Support for "code" and "data" virtual memory sizes
 +        has been added. Thanks to Clément Stenac for his patch.
 +      * python plugin: Support for Python 3 has been implemented. Thanks to
 +        Sven Trenkel for his work.
 +      * routeros plugin: Support for collecting CPU load, memory usage, used
 +        and free disk space, sectors written and number of bad blocks from
 +        MikroTik devices has been added.
 +      * swap plugin: Support for Linux < 2.6 has been added. Thanks to Lorin
 +        Scraba for his patch.
 +      * tail plugin: The new "ExcludeRegex" allows to easily exclude certain
 +        lines from the match. Thanks to Peter Warasin for his patch.
 +      * write_http plugin: The "StoreRates" option has been added. Thanks to
 +        Paul Sadauskas for his patch.
 +      * regex match: The "Invert" option has been added. Thanks to Julien
 +        Ammous for his patch.
 +
+ 2010-07-09, Version 4.9.3
+       * Build system: Checking for "strtok_r" under Solaris has been fixed.
+       * Portability: Fixes for Solaris 8 have been applied. Thanks to
+         Aurélien Reynaud and Alexander Wuerstlein for their patches.
+       * collectd: The shutdown speed when terminating the read threads has
+         been improved.
+       * collectd-nagios: The format of the performance data has been fixed.
+       * libcollectdclient: A format error in the PUTVAL command has been
+         removed. Thanks to Johan Van den Brande for fixing this.
+       * df plugin: An error message shown when "cu_mount_getlist" fails has
+         been added.
+       * processes plugin: Missing initialization code for IO members of a
+         struct has been added. Thanks to Aurélien Reynaud for fixing this.
+       * python plugin: Memory leaks in the write and notification callbacks
+         have been fixed. A possible crash when the plugin was loaded but not
+         configured has been fixed. Thanks to Sven Trenkel for his patches.
+       * rrdcached plugin: A build issue has been resolved. Thanks to
+         Thorsten von Eicken for the patch.
+       * snmp plugin: Verbosity with regard to unknown ASN types has been
+         increased. A build problem on PowerPC and ARM processors has been
+         fixed by Aurélien Reynaud; thanks!
+       * powerdns plugin: Compatibility changes for PowerDNS 2.9.22 and above
+         have been applied. Thanks to Luke Heberling for his changes.
+ 
  2010-04-22, Version 4.9.2
        * Build system, various plugins: Fixes for AIX compatibility have been
          added. Thanks to Manuel Sanmartin for his patches.

diff --cc configure.in
Simple merge

diff --cc src/plugin.c
Simple merge

diff --cc version-gen.sh
Simple merge