some additions for collectd 5.0.0 #2

Merged
merged 2 commits into from Aug 26, 2011
Merged

some additions for collectd 5.0.0 #2

merged 2 commits into from Aug 26, 2011