Merge blasphemy.mysql.com:/home/tnurnberg/monty/50-monty

into  blasphemy.mysql.com:/home/tnurnberg/monty/51-monty


include/my_time.h:
  mm
mysql-test/r/date_formats.result:
  mm
mysql-test/r/func_sapdb.result:
  mm
mysql-test/r/ps_2myisam.result:
  mm
mysql-test/r/ps_3innodb.result:
  mm
mysql-test/r/ps_4heap.result:
  mm
mysql-test/r/ps_5merge.result:
  mm
mysql-test/r/ps_7ndb.result:
  mm
mysql-test/r/strict.result:
  mm
mysql-test/r/type_date.result:
  mm
mysql-test/r/type_datetime.result:
  mm
mysql-test/t/date_formats.test:
  mm
mysql-test/t/func_sapdb.test:
  Auto merged
mysql-test/t/type_date.test:
  Auto merged
mysql-test/t/type_datetime.test:
  mm
sql/field.cc:
  mm
sql/field.h:
  mm
sql/item.cc:
  mm
sql/item.h:
  mm
sql/item_cmpfunc.cc:
  mm
sql/item_func.h:
  mm
sql/item_timefunc.cc:
  mm
sql/item_timefunc.h:
  mm
sql/my_decimal.cc:
  mm
sql/my_decimal.h:
  mm
sql/mysql_priv.h:
  mm
sql/protocol.cc:
  mm
sql/protocol.h:
  mm
sql/sp.cc:
  mm
sql/sql_base.cc:
  mm
sql/sql_class.h:
  mm
sql/sql_show.cc:
  mm
sql/structs.h:
  mm
sql/time.cc:
  mm
sql/tztime.cc:
  mm
sql-common/my_time.c:
  mm
sql/tztime.h:
  mm
sql/unireg.cc:
  mm