into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


sql/mysqld.cc:
  Auto merged
vio/viosslfactories.c:
  Auto merged
mysql-test/r/openssl_1.result:
  Manual merge
mysql-test/t/openssl_1.test:
  Manual merge