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


mysys/default.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Merge backport
mysql-test/mysql-test-run.sh:
  Merge backport
mysql-test/r/mysqldump.result:
  Manual merge
mysql-test/t/mysqldump.test:
  Manual merge