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

into mysql.com:/space/my/mysql-5.0

cmd-line-utils/readline/Makefile.am

@@ -22,7 +22,7 @@ pkginclude_HEADERS =	readline.h chardefs.h keymaps.h \
 			history.h tilde.h rlmbutil.h rltypedefs.h rlprivate.h \
 			rlshell.h xmalloc.h
 
-noinst_HEADERS =	rldefs.h histlib.h rlwinsize.h \
+noinst_HEADERS =	config_readline.h rldefs.h histlib.h rlwinsize.h \
 			posixstat.h posixdir.h posixjmp.h \
 			tilde.h rlconf.h rltty.h ansi_stdlib.h \
 			tcap.h rlstdc.h