Merge branch 'develop'

ChangeLog

configure

configure.ac

doc/tex/c_quick_ref.tex

doc/tex/f_quick_ref.tex

examples/Makefile.am

examples/Makefile.in

m4/acx_options.m4

src/Makefile.am

src/Makefile.in

src/cdf_read.c

src/cdf_util.c

src/cdf_write.c

src/cdi.h

src/cdi.inc

src/cdiFortran.c

src/cdi_error.c

src/cdi_int.c

src/cdi_int.h

src/cdipio.inc