Update for version 6-40-0002 and re-merge Thomas' changes.

src/interfaces/odbc/bind.c

src/interfaces/odbc/bind.h

src/interfaces/odbc/connection.c

src/interfaces/odbc/connection.h

src/interfaces/odbc/convert.c

src/interfaces/odbc/convert.h

src/interfaces/odbc/dlg_specific.c

src/interfaces/odbc/dlg_specific.h

src/interfaces/odbc/environ.c

src/interfaces/odbc/execute.c

src/interfaces/odbc/info.c

src/interfaces/odbc/misc.c

src/interfaces/odbc/misc.h

src/interfaces/odbc/options.c

src/interfaces/odbc/pgtypes.c

src/interfaces/odbc/pgtypes.h

src/interfaces/odbc/psqlodbc.c

src/interfaces/odbc/psqlodbc.h

src/interfaces/odbc/psqlodbc.rc

src/interfaces/odbc/qresult.c