into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint BitKeeper/deleted/.del-CMakeLists.txt~7: Auto merged