into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint


scripts/mysqld_multi.sh:
  Auto merged
mysys/default.c:
  SCCS merged