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


storage/ndb/include/util/ConfigValues.hpp:
  Auto merged
storage/ndb/src/common/util/ConfigValues.cpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  manual merge (n/a in 5.1)