into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build BitKeeper/deleted/.del-CMakeLists.txt~1: Auto merged