octo@leeloo:~/collectd $ svn merge -r786:HEAD branches/freebsd trunk

author octo <octo>

Thu, 15 Jun 2006 21:51:52 +0000 (21:51 +0000)

committer octo <octo>

Thu, 15 Jun 2006 21:51:52 +0000 (21:51 +0000)
author octo <octo>
Thu, 15 Jun 2006 21:51:52 +0000 (21:51 +0000)
committer octo <octo>
Thu, 15 Jun 2006 21:51:52 +0000 (21:51 +0000)
diff --cc configure.in
Simple merge
diff --cc src/Makefile.am
Simple merge
diff --cc src/memory.c
Simple merge