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

into mysql.com:/my/mysql-4.0


BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union