Merge neptunus.(none):/home/msvensson/mysql/bug18310/my50-bug18310

into  neptunus.(none):/home/msvensson/mysql/bug18310/my51-bug18310


BUILD/SETUP.sh:
  Auto merged

BUILD/SETUP.sh

@@ -44,8 +44,8 @@ set -e
 export AM_MAKEFLAGS
 AM_MAKEFLAGS="-j 4"
 
-# SSL library to use. Should be changed to --with-yassl
-SSL_LIBRARY=--with-openssl
+# SSL library to use.
+SSL_LIBRARY=--with-yassl
 
 # If you are not using codefusion add "-Wpointer-arith" to WARNINGS
 # The following warning flag will give too many warnings: