into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new storage/ndb/src/kernel/vm/Configuration.cpp: Auto merged
