Merged Niki's changes to `collectd.h' to trunk/