From: Tor Didriksen
Date: December 20 2010 1:27pm
Subject: bzr push into mysql-trunk-bugfixing branch (tor.didriksen:3450 to 3451)
List-Archive: http://lists.mysql.com/commits/127310
Message-Id: <20101220132717.9873F341E@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3451 Tor Didriksen	2010-12-20 [merge]
      Empty merge opt-team => trunk-bugfixing

 3450 Tor Didriksen	2010-12-20 [merge]
      Merge 5.5-bugteam => trunk-bugfixing
      
      text conflict: include/CMakeLists.txt

    modified:
      include/CMakeLists.txt
      scripts/mysql_config.sh
      sql/sql_select.cc
      support-files/CMakeLists.txt
No bundle (reason: useless for push emails).