Merge branch 'netlinkfix' of git://github.com/marekbecka/collectd