into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003: Auto merged