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


sql/sql_class.cc:
  Auto merged