Merge collectd-3.10.1-4 into bpo branch.

diff --cc debian/changelog
index 0f99d68adac56827e51bed065355a8cbb42ba62e,6d2221800a57e3448f78980e3cd1bf655b8a60de..0e6a5ac3fb1d18156301876bafdbfd240eab002d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,12 +1,19 @@@
+ collectd (3.10.1-4) unstable; urgency=low
+ 
+   * Changed collectd-dbg's section and priority to "devel" and "extra"
+     respectively.
+   * Set init start sequence code to 95 to be sure to start after any daemons
+     that data is collected from.
+ 
+  -- Sebastian Harl <sh@tokkee.org>  Thu,  5 Oct 2006 10:25:07 +0000
+ 
 +collectd (3.10.1-2bpo1) sarge-backports; urgency=low
 +
 +  * Rebuild for Sarge.
 +  * Forcing the use of libmysqlclient14 and librrd2.
 +
 + -- Sebastian Harl <sh@tokkee.org>  Sun,  6 Aug 2006 14:17:57 +0200
 +
  collectd (3.10.1-3) unstable; urgency=low
  
    * Added --oknodo to start-stop-daemon in the init script (Closes: #379703).

diff --cc debian/control
Simple merge