into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb storage/ndb/include/kernel/signaldata/LqhFrag.hpp: manual merge