Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint

into  mysql.com:/usr/home/ram/work/5.0.b18267


zlib/Makefile.am:
  Auto merged

zlib/Makefile.am

@@ -18,6 +18,8 @@
 
 INCLUDES=		-I$(top_builddir)/include -I$(top_srcdir)/include
 
+LIBS= $(NON_THREADED_LIBS)
+
 pkglib_LTLIBRARIES=libz.la
 
 libz_la_LDFLAGS= -version-info 3:3:2