Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp

include/Makefile.am

@@ -29,7 +29,7 @@ noinst_HEADERS =	config-win.h config-os2.h config-netware.h \
 			mysys_err.h my_base.h help_start.h help_end.h \
 			my_nosys.h my_alarm.h queues.h rijndael.h sha1.h \
 			my_aes.h my_tree.h hash.h thr_alarm.h \
-			thr_lock.h t_ctype.h violite.h md5.h \
+			thr_lock.h t_ctype.h violite.h md5.h base64.h \
 			mysql_version.h.in my_handler.h my_time.h decimal.h
 
 # mysql_version.h are generated