Merge mysql.com:/home/my/mysql-4.1

into  mysql.com:/home/my/mysql-5.0

support-files/mysql.spec.sh

@@ -349,6 +349,7 @@ BuildMySQL "--disable-shared \
 %if %{STATIC_BUILD}
 		--with-mysqld-ldflags='-all-static' \
 		--with-client-ldflags='-all-static' \
+		--with-zlib-dir=bundled \
 		$USE_OTHER_LIBC_DIR \
 %endif
 		--with-comment=\"MySQL Community Edition - Standard (GPL)\" \