into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb BitKeeper/deleted/.del-ndb_dd_advance.test: Auto merged