Merge branch 'collectd-4.6' into collectd-4.7

Conflicts:
	ChangeLog
	version-gen.sh

diff --cc ChangeLog
index 1d6decbea9828e484158db9bed9b54d910dab889,b1908f42584d02948b974f53fcc076ff58d0feca..969c9e948a681e9d3753d6c2d6ef34910a2bb74c
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,77 -1,24 +1,98 @@@
 +2009-07-19, Version 4.7.2
 +      * Build system: Support for `DESTDIR' has been fixed in the Java
 +        bindings.
 +      * collectd: Okay-notifications have been fixed. Thanks to Andrés J.
 +        Díaz for fixing this bug.
 +      * collectd: A programming error has been fixed in the notification
 +        code. The bug may result in an assertion failure.
 +      * memcached plugin: Portability fix for Solaris. Thanks to Amit Gupta
 +        for reporting the bug.
 +      * ping plugin: Link the plugin with libm.
 +
 +2009-06-02, Version 4.7.1
 +      * Build system: Detection of Java has been improved and missing
 +        details have been added to the configuration summary. Support for
 +        libtool 2.2 has been added.
 +      * collectd: Two bugs with the threshold checking have been fixed. The
 +        first one prevented thresholds to be checked at all, the second one
 +        caused wrong behavior with the persistency option. Thanks to Andrés
 +        J. Díaz for fixing these problems.
 +      * collectd: Handling of the `Include' configuration option has been
 +        fixed.
 +      * rrdtool plugin: Make sure initialization is run only once. This
 +        resolves problems under Solaris and potentially other systems.
 +        Thanks to Amit Gupta for reporting this bug.
 +      * java plugin: Make it possible to use dots ('.') instead of slashes
 +        ('/') as the class separator. Thanks to Randy Rizun for pointing
 +        this out.
 +      * swap plugin: A work-around for 32-bit Solaris has been added. Thanks
 +        to Doug MacEachern for the patch.
 +
 +2009-05-11, Version 4.7.0
 +      * apache plugin: Support to query multiple servers has been added.
 +        Thanks to Amit Gupta for the patch.
 +      * apache plugin: Handling of lighttpd's scoreboard statistics has been
 +        improved. Thanks to Amit Gupta for the patch.
 +      * conntrack plugin: The new conntrack plugin collects the connection
 +        tracking table size. Thanks to Tomasz Pala for the patch.
 +      * fscache plugin: The new fscache plugin collects statistics about
 +        Linux' file-system based caching framework. Thanks to Edward
 +        Konetzko for the patch.
 +      * gmond plugin: The new gmond plugin can receive and interpret
 +        multicast traffic from Ganglia's gmond daemon.
 +      * java plugin: The new java plugin exports the collectd API to Java,
 +        making it possible to write extensions to collectd in Java.
 +      * memcachec plugin: The new memcachec plugin queries data from a
 +        memcached daemon and parses it similar to the cURL plugin. Thanks to
 +        Doug MacEachern for the initial code.
 +      * memcached plugin: Support for connections over UNIX domain sockets
 +        has been added. Thanks to Franck Lombardi for the patch.
 +      * memory plugin: Support for OpenBSD and possibly other *BSDs has been
 +        added. Thanks to Simon Kuhnle for the patch.
 +      * mysql plugin: Support to query multiple databases has been added.
 +        Thanks to Doug MacEachern for the patch.
 +      * mysql plugin: Master/slave statistics have been added.
 +      * mysql plugin: Lock statistics have been added. Thanks to Rodolphe
 +        Quiédeville for the patch.
 +      * network plugin: The possibility to sign or encrypt network traffic
 +        has been added.
 +      * protocols plugin: The new protocols plugin provides information
 +        about network protocols, such as IP, TCP and UDP.
 +      * snmp plugin: The intervals given in the configuration of the SNMP
 +        plugin must no longer be a multiple of the global interval.
 +      * table plugin: The new Table plugin provides parsing for table-like
 +        structured files, such as many files beneath /proc.
 +      * ted plugin: The new TED plugin reads power consumption measurements
 +        from “The Energy Detective” (TED). Thanks to Eric Reed for this
 +        plugin.
 +      * onewire plugin: The new `Interval' option allows collecting
 +        information from OneWire sensors at arbitrary intervals.
 +      * ping plugin: Support for collecting the drop rate and standard
 +        deviation of round-trip times has been added.
 +      * uptime plugin: The new uptime plugin can collect the server's
 +        uptime. Thanks to Marco Chiappero for the patch.
 +
+ 2009-09-10, Version 4.6.5
+       * collectd: Remove old values when a cache entry is marked as missing.
+         This way the “GETVAL” command of the UnixSock plugin doesn't return
+         old, no longer valid values when this happens. Thanks to Andrés J.
+         Díaz for the patch.
+       * apache, ascent, bind, curl, nginx plugins: Advise the cURL library
+         to follow redirects. Thanks to Joey Hess for reporting this bug.
+       * df plugin: Check the ignorelist before stating the file system,
+         possibly reducing the number of stats considerably. Thanks to Joey
+         Hess for reporting this bug.
+       * iptables plugin: Support for the new libiptc API has been added.
+         Thanks to Sebastian Harl for the patch. The build system has been
+         updated to the plugin only includes the shipped header files when it
+         is linked with the shipped library, too.
+       * libvirt plugin: Re-connect to libvirtd if connecting fails. Thanks
+         to Alan Pevec for the patch.
+       * powerdns plugin: Set a timeout when reading data from the datagram
+         socket. Handling of the “LocalSocket” option has been fixed.  An
+         incorrectly used “type” has been corrected. Thanks to Luke Heberling
+         for his patches.
+ 
  2009-07-18, Version 4.6.4
        * collectd: Okay-notifications have been fixed. Thanks to Andrés J.
          Díaz for fixing this bug.

diff --cc contrib/collection3/etc/collection.conf
Simple merge

diff --cc src/powerdns.c
Simple merge