into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new


storage/ndb/include/util/Bitmask.hpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/test/ndbapi/testDataBuffers.cpp:
  Auto merged
mysql-test/r/ndb_bitfield.result:
  merge
mysql-test/t/ndb_bitfield.test:
  merge