Merge branch 'collectd-3.9'

diff --cc ChangeLog
index 0e3c7a7,bfca172..0a181fe
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,14 -1,4 +1,14 @@@
- 2006-06-18, Version 3.9.4
 +      * 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-25, 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.

diff --cc collectd.spec
Simple merge

diff --cc debian/changelog
Simple merge