Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl

into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl


mysql-test/t/disabled.def:
  Manual merge

mysql-test/t/disabled.def

@@ -42,3 +42,5 @@ rpl_ndb_myisam2ndb       : Bug #19710  Cluster replication to partition table fa
 rpl_ndb_stm_innodb       : Bug#26783
 ndb_partition_error2	 : HF is not sure if the test can work as internded on all the platforms
 
+im_options_set       : Bug#20294: Instance manager tests fail randomly
+im_options_unset     : Bug#20294: Instance manager tests fail randomly