into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


ndb/src/common/transporter/Packer.cpp:
  Auto merged
ndb/src/common/transporter/TCP_Transporter.hpp:
  Auto merged
ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
  manual merge
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  manual merge