into  vajra.(none):/opt/local/work/mysql-5.1-runtime


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