Merge pull request #2 from trenkel/collectd-4.10