netcdf-c

Description:
    Merge r2959:3024 from trunk to NCF-29 branch.

Tested on:
    Mac OSX/64 (amazon) w/--enable-netcdf-4 --enable-extra-tests
            --enable-extra-example-tests --disable-shared --enable-logging