From: Alexander Nozdrin
Date: May 6 2011 1:22pm
Subject: bzr push into mysql-trunk branch (alexander.nozdrin:3379 to 3380)
List-Archive: http://lists.mysql.com/commits/136837
Message-Id: <201105061322.p46DM8BO020540@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3380 Alexander Nozdrin	2011-05-06 [merge]
      Empty merge from mysql-5.5.

 3379 Alexander Nozdrin	2011-05-06 [merge]
      Manual merge from mysql-5.5.
      Conflicts:
        - mysql-test/r/cast.result

    modified:
      scripts/make_win_bin_dist
No bundle (reason: useless for push emails).