BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-test-ssl~ed0a50364f2a51d7:
  Auto merged
include/Makefile.am:
  Auto merged
include/mysql.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysys/md5.c:
  Auto merged
sql/Makefile.am:
  Auto merged