octo@leeloo:~/collectd $ svn merge -r773:777 branches/collectd-3.9 trunk

diff --cc ChangeLog
index 326926ccc1f9c61a39247a78912e76cc05118892,871acf09cc2e2fbe7d331dabe714ae254cb89619..5d421db4254250424a54ed6b41273a094036f670
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,10 +1,15 @@@
 +      * 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.
 +
+ 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
+         check that.
+       * Changed the build system to find the netinet-includes under FreeBSD
+         and therefore successfully build the `liboping' library there.
+ 
  2006-05-09, Version 3.9.2
        * Applied a patch to the `liboping' library. Due to a bug in the
          sequence checking the `ping' plugin stopped working after

diff --cc collectd.spec
Simple merge

diff --cc configure.in
Simple merge

diff --cc debian/changelog
Simple merge

diff --cc src/liboping/liboping.c
Simple merge