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

into mysql.com:/data0/mysqldev/my/mysql-5.0-merge


BitKeeper/deleted/.del-federated.disabled~a5703a3321e4108:
  Auto merged

server-tools/instance-manager/Makefile.am

@@ -50,11 +50,11 @@ libnet_a_LIBADD= $(top_builddir)/sql/password.$(OBJEXT) \
 
 CLEANFILES= net_serv.cc client_settings.h
 
-net_serv.cc: Makefile
+net_serv.cc:
 	rm -f $(srcdir)/net_serv.cc
 	@LN_CP_F@ $(top_srcdir)/sql/net_serv.cc $(srcdir)/net_serv.cc
 
-client_settings.h: Makefile
+client_settings.h:
 	rm -f $(srcdir)/client_settings.h
 	@LN_CP_F@ $(top_srcdir)/sql/client_settings.h $(srcdir)/client_settings.h