Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build

into  mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build


BitKeeper/deleted/.del-CMakeLists.txt~13:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~14:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~3:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~8:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~9:
  Auto merged
scripts/make_win_bin_dist:
  SCCS merged

scripts/make_win_bin_dist

@@ -278,7 +278,7 @@ cp libmysql/libmysql.def $DESTDIR/include/
 mkdir -p $DESTDIR/lib/opt
 cp libmysql/$TARGET/libmysql.dll \
    libmysql/$TARGET/libmysql.lib \
-   client/$TARGET/mysqlclient.lib \
+   libmysql/$TARGET/mysqlclient.lib \
    regex/$TARGET/regex.lib \
    strings/$TARGET/strings.lib \
    zlib/$TARGET/zlib.lib $DESTDIR/lib/opt/
@@ -288,7 +288,7 @@ if [ x"$PACK_DEBUG" = x"" -a -f "libmysql/debug/libmysql.lib" -o \
   mkdir -p $DESTDIR/lib/debug
   cp libmysql/debug/libmysql.dll \
      libmysql/debug/libmysql.lib \
-     client/debug/mysqlclient.lib \
+     libmysql/debug/mysqlclient.lib \
      mysys/debug/mysys.lib \
      regex/debug/regex.lib \
      strings/debug/strings.lib \