into  mysql.com:/home/stewart/Documents/MySQL/5.1/merge


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged