into  pilot.blaudden:/home/msvensson/mysql/bug21781/my51-bug21781


mysql-test/t/rpl_openssl.test:
  Auto merged
sql/mysql_priv.h:
  Manual merge
sql/mysqld.cc:
  Manual merge
sql/set_var.cc:
  Manual merge