bzr commit into mysql-trunk branch (Georgi.Kodinov:3335)

[Georgi Kodinov]

#At file:///Users/kgeorge/mysql/work/mysql-trunk/ based on revid:mattias.jonsson@stripped

 3335 Georgi Kodinov	2011-03-28 [merge]
      merge mysql-5.5->mysql-trunk

    removed:
      win/build-vs10.bat
      win/build-vs10_x64.bat
=== removed file 'win/build-vs10.bat'
--- a/win/build-vs10.bat	2011-03-28 10:43:30 +0000
+++ b/win/build-vs10.bat	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-@echo off
-
-REM Copyright (c) 2006,2010 Oracle and/or its affiliates. All rights reserved.
-REM 
-REM This program is free software; you can redistribute it and/or modify
-REM it under the terms of the GNU General Public License as published by
-REM the Free Software Foundation; version 2 of the License.
-REM 
-REM This program is distributed in the hope that it will be useful,
-REM but WITHOUT ANY WARRANTY; without even the implied warranty of
-REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-REM GNU General Public License for more details.
-REM 
-REM You should have received a copy of the GNU General Public License
-REM along with this program; if not, write to the Free Software
-REM Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-cmake -G "Visual Studio 10"
-

=== removed file 'win/build-vs10_x64.bat'
--- a/win/build-vs10_x64.bat	2011-03-28 10:43:30 +0000
+++ b/win/build-vs10_x64.bat	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-@echo off
-
-REM Copyright (c) 2006,2010 Oracle and/or its affiliates. All rights reserved.
-REM 
-REM This program is free software; you can redistribute it and/or modify
-REM it under the terms of the GNU General Public License as published by
-REM the Free Software Foundation; version 2 of the License.
-REM 
-REM This program is distributed in the hope that it will be useful,
-REM but WITHOUT ANY WARRANTY; without even the implied warranty of
-REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-REM GNU General Public License for more details.
-REM 
-REM You should have received a copy of the GNU General Public License
-REM along with this program; if not, write to the Free Software
-REM Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-cmake -G "Visual Studio 10 Win64"
-

No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).