Merge rparranovo@bk-internal.mysql.com:/home/bk/mysql-5.1-new

into  mysql.com:/home/novo/MySQL/mysql-5.1


support-files/mysql.spec.sh:
  Auto merged

support-files/mysql.spec.sh

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