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


mysql-test/r/openssl_1.result:
  Auto merged
mysql-test/t/openssl_1.test:
  Auto merged