into  trift2.:/MySQL/M51/push-5.1


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/rpl_000015.test:
  Auto merged
server-tools/instance-manager/Makefile.am:
  Auto merged
server-tools/instance-manager/guardian.cc:
  Auto merged
sql/log_event.cc:
  Auto merged