Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1

into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build

Makefile.am

@@ -91,6 +91,7 @@ bin-dist:		all
 # Remove BK's "SCCS" subdirectories from source distribution
 dist-hook:
 	rm -rf `find $(distdir) -type d -name SCCS -print`
+	rm -f  `find $(distdir) -type l -print`
 
 tags:
 	support-files/build-tags

mysql-test/lib/mtr_process.pl

@@ -1053,7 +1053,7 @@ sub sleep_until_file_created ($$$) {
 
     # Print extra message every 60 seconds
     my $seconds= ($loop * $sleeptime) / 1000;
-    if ( $seconds > 1 and int($seconds) % 60 == 0 )
+    if ( $seconds > 1 and int($seconds * 10) % 600 == 0 )
     {
       my $left= $timeout - $seconds;
       mtr_warning("Waited $seconds seconds for $pidfile to be created, " .