bzr push into mysql-trunk branch (tor.didriksen:4432 to 4433)

[Tor Didriksen]

 4433 Tor Didriksen	2012-09-05 [merge]
      empty merge from 5.6 (fixing merge jam)

    modified:
      mysql-test/mysql-test-run.pl
 4432 sayantan.dutta@stripped	2012-09-05
      upmerge 14531937 5.6 => trunk

    modified:
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2012-09-05 11:32:31 +0000
+++ b/mysql-test/mysql-test-run.pl	2012-09-05 16:09:51 +0000
@@ -5460,7 +5460,7 @@ sub envsubst {
       return "";
     }
   }
-  else 
+  else
   {
     if ( ! defined $ENV{$string} )
     {

No bundle (reason: useless for push emails).