into mysql.com:/home/jonas/src/wl1671


ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
ndb/src/kernel/ndb-main/Main.cpp:
  Auto merged