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