Merge akishkin@work.mysql.com:/home/bk/mysql-4.0

into mysql.com:/home/walrus/bk/40


BitKeeper/etc/logging_ok:
  auto-union