Merge neptunus.(none):/home/msvensson/mysql/bug18818/my41-bug18818

into  neptunus.(none):/home/msvensson/mysql/bug18818/my50-bug18818


BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Changes will be moved to zlib.m4 and openssl.m4