into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/ndb_binlog_ddl_multi.test:
  Auto merged
sql/rpl_injector.cc:
  Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  manual merge