into  neptunus.(none):/home/msvensson/mysql/bug14871/my51-bug14871


client/mysqldump.c:
  Auto merged
mysql-test/r/mysqldump.result:
  Merge
mysql-test/t/mysqldump.test:
  Merge