Merge branch 'collectd-3.10'

diff --cc configure.in
Simple merge

diff --cc debian/control
index 9c0e11b4f42ad91dfcd6f986b8ef3b1fde3e251c,87d1f75bca4361c69d25297894a14801634b2f1b..f9f8f3c2d20a48e5e656350a9328dc14762e13ec
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -46,5 -131,6 +131,5 @@@ Description: statistics collection daem
   it's very fast and easy on the system. Also, the statistics are very fine
   grained since the files are updated every 10 seconds.
   .
-  This package contains the multimeter plugin which collects values from a
-  multimeter connected to a serial port.
+  This package contains the development files needed to create your own
+  plugins.
 -