into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug17700/my51-bug17700


scripts/mysql_fix_privilege_tables.sh:
  Auto merged