bzr push into mysql-5.1-telco-6.3 branch (magnus.blaudd:3409 to 3410)

[Magnus Blåudd]

 3410 Magnus Blåudd	2011-04-04
      Add missing stop slave in rpl_grant.test

    modified:
      mysql-test/suite/rpl/t/rpl_grant.test
 3409 Magnus Blåudd	2011-04-04 [merge]
      Merge

    modified:
      config/ac-macros/maintainer.m4
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/suite/rpl/t/rpl_grant.test'
--- a/mysql-test/suite/rpl/t/rpl_grant.test	2010-05-24 13:54:08 +0000
+++ b/mysql-test/suite/rpl/t/rpl_grant.test	2011-04-04 11:04:19 +0000
@@ -36,3 +36,5 @@ sync_slave_with_master;
 --echo **** On Slave ****
 SELECT user,host FROM mysql.user WHERE user like 'dummy%';
 SELECT COUNT(*) FROM mysql.user WHERE user like 'dummy%';
+
+--source include/master-slave-end.inc

No bundle (reason: useless for push emails).