into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb storage/ndb/tools/restore/Restore.cpp: manual merge