Merge branch 'hdf4' of https://github.com/Unidata/netcdf-c into hdf4
Merge branch 'hdf4' of https://github.com/Unidata/netcdf-c into hdf4