Merge mysql.com:/home/kent/bk/mysql-5.0-build

into  mysql.com:/home/kent/bk/mysql-5.1-build


Makefile.am:
  Auto merged

Makefile.am

@@ -85,6 +85,7 @@ bin-dist:		all
 # Create initial database files for Windows installations.
 dist-hook:
 	rm -rf `find $(distdir) -type d -name SCCS -print`
+	rm -f  `find $(distdir) -type l -print`
 	if echo "$(distdir)" | grep -q '^/' ; then \
           mkdir -p "$(distdir)/win" ; \
 	  scripts/mysql_install_db --no-defaults --windows \