Merge branch 'barometer_bmp085' of github.com:tmtom/collectd into barometer_bmp085