into  chilla.local:/home/mydev/mysql-5.1-amerge


mysql-test/r/merge.result:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
sql/sql_table.cc:
  Auto merged
storage/ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
configure.in:
  Manual merge
mysql-test/extra/binlog_tests/blackhole.test:
  Manual merge
mysql-test/r/binlog_stm_blackhole.result:
  Manual merge
sql/ha_myisammrg.cc:
  Manual merge
sql/handler.h:
  Manual merge
storage/blackhole/ha_blackhole.cc:
  Manual merge
support-files/mysql.spec.sh:
  Manual merge