into  salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-merge


support-files/mysql.spec.sh:
  Auto merged
client/mysqldump.c:
  manual merge
mysql-test/r/mysqldump.result:
  manual merge
mysql-test/t/mysqldump.test:
  manual merge