Merge remote-tracking branch 'github/collectd-5.2' into collectd-5.2

diff --combined ChangeLog
index 056678037ca99ef48fe14a90281bbba35a48766d,0850531502e897d7ace6eac08fd9f93464e02a88..c59e112e61e466a2f823635cc536a786473a3ae3
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,4 +1,4 @@@
- 2013-01-27, Version 5.1.2
+ 2013-01-27, Version 5.2.1
        * Build system: "make distcheck" has been fixed. Build fixes Solaris
          and systems without gcrypt. Thanks to Yves Mettier for his patches.
        * collectd: The complaint mechanism was fixed. It reported messages
@@@ -17,12 -17,12 +17,12 @@@
        * redis plugin: A build failure has been fixed. Thanks to Pierre-Yves
          Ritschard for his patch.
        * varnish plugin: Fix a problem with instances without name.
 -      * write_graphite: A regression which rendered the "SeparateInstances"
 -        and "AlwaysAppendDS" options unusable has been fixed. A failed
 -        assertion when using types with many data sources has been fixed.
 -        Improve reporting of connection errors to not spam log files too
 -        much. Thanks to Pierre-Yves Ritschard for reporting the logging
 -        problem.
 +      * write_graphite plugin: A regression which rendered the
 +        "SeparateInstances" and "AlwaysAppendDS" options unusable has been
 +        fixed. A failed assertion when using types with many data sources
 +        has been fixed. Improve reporting of connection errors to not spam
 +        log files too much. Thanks to Pierre-Yves Ritschard for reporting
 +        the logging problem.
        * zfs_arc plugin: Fix the type used for mutex misses. Thanks to Yves
          Mettier for reporting this bug.