Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql

Build-tools/Do-compile:
  Auto merged

BitKeeper/etc/logging_ok

@@ -2,3 +2,4 @@ Miguel@light.local
 monty@hundin.mysql.fi
 paul@central.snake.net
 serg@serg.mysql.com
+monty@work.mysql.com

Build-tools/Do-compile

@@ -113,6 +113,8 @@ if ($opt_stage <= 1)
   $opt_config_options.=" --with-low-memory" if ($opt_with_low_memory);
   # Fix files if this is in another timezone than work.mysql.com
   unlink("config.cache");
+  unlink("bdb/build_unix/config.cache");
+  unlink("innobase/config.cache");
   log_system("$make clean") if ($opt_use_old_distribution);
   if ($opt_static_server)
   {