into  chilla.local:/home/mydev/mysql-5.1-merge


include/mysql.h:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
BitKeeper/deleted/.del-make_win_bin_dist:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~1:
  Merge from 5.0
configure.in:
  Merge from 5.0