into mysql.com:/home/dlenev/src/mysql-5.0-merges


client/Makefile.am:
  Auto merged
strings/Makefile.am:
  Auto merged