get rid of grib api stuff
Merge branch 'trunk' of http://github.com/ksshannon/gdal into trunk