into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/r/mysqldump-max.result:
  Auto merged
mysql-test/r/rpl_trigger.result:
  Auto merged
mysql-test/r/type_newdecimal.result:
  Auto merged
mysql-test/t/rpl_trigger.test:
  Auto merged
mysql-test/t/type_newdecimal.test:
  Auto merged