into poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca storage/ndb/src/ndbapi/NdbRecAttr.cpp: manual merge, use local copy