Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb

into mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged