BitKeeper/deleted/.del-isamchk.1.in~9d44303f6d951962:
  Auto merged
BitKeeper/deleted/.del-isamlog.1.in~416d91adbf665b19:
  Auto merged
configure.in:
  Auto merged
netware/BUILD/compile-linux-tools:
  Auto merged
netware/BUILD/compile-netware-END:
  Auto merged
man/Makefile.am:
  - after merge fix
support-files/mysql.spec.sh:
  - after merge fix