into  mysql.com:/home/jimw/my/mysql-5.0-clean


configure.in:
  Auto merged
sql/hostname.cc:
  Resolve conflict