into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


scripts/mysql_fix_privilege_tables.sql:
  Auto merged