into mysql.com:/home/stewart/Documents/MySQL/5.0/main BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003: Auto merged