extra/perror.c:
  Auto merged
ndb/include/debugger/SignalLoggerManager.hpp:
  Auto merged
ndb/include/ndb_version.h:
  Auto merged
ndb/src/common/portlib/unix/NdbMem.c:
  Auto merged
ndb/src/common/portlib/unix/NdbThread.c:
  Auto merged
ndb/src/common/util/Parser.cpp:
  Auto merged
ndb/src/common/util/getarg.c:
  Auto merged
ndb/src/common/util/version.c:
  Auto merged
ndb/src/kernel/blocks/backup/restore/Restore.cpp:
  Auto merged
ndb/src/kernel/blocks/dbutil/DbUtil.cpp:
  Auto merged
ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Auto merged
ndb/src/kernel/ndb-main/Main.cpp:
  Auto merged
ndb/src/mgmapi/test/keso.c:
  Auto merged
ndb/src/mgmclient/test_cpcd/test_cpcd.cpp:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted