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


client/mysqltest.c:
  Auto merged
config/ac-macros/yassl.m4:
  Auto merged
include/Makefile.am:
  Auto merged
libmysql_r/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
sql/sql_acl.cc:
  Auto merged