Makefile.am:
  Auto merged
client/Makefile.am:
  Auto merged
libmysql/Makefile.am:
  Auto merged
libmysql_r/Makefile.am:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
netware/Makefile.am:
  Auto merged
support-files/Makefile.am:
  Auto merged