into poseidon.mysql.com:/home/tomas/mysql-5.0-ndb-clean ndb/src/ndbapi/NdbDictionaryImpl.cpp: Auto merged