Merge mysqldev@win2003-x86:my/mysql-5.1-new

into  mysql.com:/usr/local/mysql/mysql-5.1-win-src

dbug/Makefile.am

@@ -20,7 +20,7 @@ LDADD =                 libdbug.a ../mysys/libmysys.a ../strings/libmystrings.a
 pkglib_LIBRARIES =      libdbug.a
 noinst_HEADERS =        dbug_long.h
 libdbug_a_SOURCES =     dbug.c sanity.c
-EXTRA_DIST =            example1.c example2.c example3.c \
+EXTRA_DIST =            cmakelists.txt example1.c example2.c example3.c \
                         user.r monty.doc dbug_add_tags.pl \
                         my_main.c main.c factorial.c dbug_analyze.c
 NROFF_INC =             example1.r example2.r example3.r main.r \

extra/yassl/taocrypt/Makefile.am

 SUBDIRS = src
-EXTRA_DIST = taocrypt.dsw taocrypt.dsp taocrypt.vcproj
+EXTRA_DIST = taocrypt.dsw taocrypt.dsp taocrypt.vcproj cmakelists.txt