Merge pull request #566 from timl/drbd

Collect drbd statistics on linux

diff --cc AUTHORS
Simple merge

diff --cc README
Simple merge

diff --cc configure.ac
Simple merge

diff --cc src/Makefile.am
Simple merge

diff --cc src/collectd.conf.in
Simple merge

diff --cc src/types.db
Simple merge