into  mysql.com:/home/jimw/my/mysql-5.1-kill-sql-bench


Makefile.am:
  Resolve conflict
configure.in:
  Resolve conflict