Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0

tools/Makefile.am

-INCLUDES =		@MT_INCLUDE@ -I$(srcdir)/../include \
+INCLUDES =		@MT_INCLUDES@ -I$(srcdir)/../include \
 			$(openssl_includes) -I../include
 LIBS=			@openssl_libs@
 LDADD=			@CLIENT_EXTRA_LDFLAGS@ ../libmysql_r/libmysqlclient_r.la