Merge of branch cdo-pio into trunk cdi

src/stream_ext.c

src/stream_gribapi.c

src/stream_gribapi.h

src/stream_ieg.c

src/stream_srv.c