into  chilla.local:/home/mydev/mysql-5.0-axmrg


configure.in:
  Auto merged
myisam/mi_dynrec.c:
  Auto merged
sql/ha_federated.cc:
  Auto merged