Merge four.local.lan:/work/merge/mysql-5.0-dev

into  four.local.lan:/work/merge/mysql-5.1-dev


mysql-test/suite/rpl/r/rpl_000015.result:
  Auto merged
mysql-test/suite/rpl/t/rpl_000015.test:
  Auto merged