into  mysql.com:/home/ram/work/b25301/b25301.5.1


mysql-test/t/strict.test:
  Auto merged
sql-common/my_time.c:
  Auto merged
mysql-test/r/date_formats.result:
  merging
mysql-test/r/strict.result:
  merging
mysql-test/r/type_datetime.result:
  merging