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


BitKeeper/etc/ignore:
  auto-union
sql/gen_lex_hash.cc:
  Auto merged