into  synthia.local:/home/mydev/mysql-5.1-axmrg


configure.in:
  Auto merged
libmysql/libmysql.c:
  Auto merged