into  stella.local:/home2/mydev/mysql-5.1-axmrg


storage/myisam/mi_packrec.c:
  Auto merged
mysql-test/t/disabled.def:
  Manual merge from 5.0