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


configure.in:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged