into  damiendev.:C:/build/mysql-5.1


mysql-test/t/mysqldump.test:
  Auto merged
client/mysqldump.c:
  Manual merge damiendev.:C:/build/mysql-5.1/..\dev50
  into  damiendev.:C:/build/mysql-5.1
mysql-test/r/mysqldump.result:
  Manual merge damiendev.:C:/build/mysql-5.1/..\dev50
  into  damiendev.:C:/build/mysql-5.1