into sinisa.nasamreza.org:/mnt/work/mysql-4.0


scripts/mysqld_safe.sh:
  Auto merged
sql/net_pkg.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged