+SOSI_INC_DIR in sosi makefile
Merge branch 'trunk' of https://github.com/kartverket/gdal into trunk