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


mysql-test/t/ndb_autodiscover3.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged