into  naruto.:C:/cpp/mysql-5.1-new-maint


include/my_time.h:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
sql/item_timefunc.cc:
  Auto merged