Merge trunk into cdi-pio.

.gitattributes

ChangeLog

NEWS

config/default

configure

configure.ac

m4/acx_options.m4

src/Makefile.am

src/Makefile.in

src/cdi.h

src/cdi.inc

src/cdiFortran.c

src/cgribex.h

src/cgribexlib.c

src/config.h.in

src/gribapi.h

src/grid.c

src/stream.c

src/stream_cdf.c

src/stream_cgribex.c