Merge branch 'ad/aquaero'

diff --cc AUTHORS
Simple merge

diff --cc README
Simple merge

diff --cc configure.in
Simple merge

diff --cc src/Makefile.am
Simple merge

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

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