Merge branch 'collectd-3.10'

diff --cc configure.in
Simple merge

diff --cc debian/control
index 9c0e11b,87d1f75..f9f8f3c
--- 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.
 -