into  damien-katzs-computer.local:/Users/dkatz/mysql51


client/mysqldump.c:
  Auto merged
sql/mysqld.cc:
  Auto merged