Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1

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


mysql-test/t/rpl_slave_status.test:
  Merge to 5.0

mysql-test/t/rpl_slave_status.test

 # Test case for BUG #10780
-source include/master-slave.inc;
+--source include/master-slave.inc
 connection master;
 grant replication slave on *.* to rpl@127.0.0.1 identified by 'rpl';
 connection slave;