Just added
Added collectd
Merge branch 'v0.3-generic' of github.com:ff-kbu/fff into v0.3-generic