Merge branch 'collectd-3.9'

diff --cc ChangeLog
index 9346482,49e030f..0e3c7a7
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,13 -1,11 +1,21 @@@
 +      * The `disk' plugin has been ported to Darwin.
 +      * The `battery' plugin should work on many Apple computers now.
 +      * The `traffic' plugin can now ignore certain interfaces. Also,
 +        statistics for sent/received packets and errors have been added.
 +      * A plugin to monitor APC UPSes using `apcupsd' has been added. Thanks
 +        to Anthony Gialluca for contributing this plugin and providing me
 +        with a test environment :)
 +      * A plugin for moniroting an NTP instance and the local clock drift
 +        has been added.
 +
+ 2006-06-18, Version 3.9.4
+       * The Solaris code in the `swap' plugin has been changed to reflect
+         the numbers returned by `swap -s'. Thanks to Christophe Kalt for
+         working this out.
+       * The debugging system has been fixed to work with the Sun libc.
+       * When built without librrd the variable `operating_mode' could be
+         uninitialized. Thanks to David Elliot for reporting the bug.
+ 
  2006-06-01, Version 3.9.3
        * Fixed the ping-plugin under FreeBSD and Mac OS X. Potentially other
          operating systems also profit from the changes, but I wasn't able to

diff --cc collectd.spec
Simple merge

diff --cc debian/changelog
Simple merge

diff --cc src/collectd.c
Simple merge