into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/t/rpl_openssl.test:
  Auto merged
vio/vio.c:
  Auto merged
vio/viossl.c:
  Auto merged