Merge branch 'develop'

ChangeLog

app/cdi.c

app/printinfo.h

configure

configure.ac

doc/tex/formats.tex

m4/acx_options.m4

src/Makefile.in

src/cdf_write.c

src/cdi.h

src/cdi.inc

src/cdiFortran.c

src/cdi_int.h

src/cgribex.h

src/cgribexlib.c

src/grid.c

src/ieg.h

src/stream_cdf_i.c

src/stream_cdf_o.c

src/stream_cgribex.c