into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca


sql/ha_ndbcluster.h:
  Auto merged
sql/ha_ndbcluster.cc:
  manual merge