into  magare.gmz:/home/kgeorge/mysql/work/B29536-5.1-opt


sql/field.cc:
  Auto merged
sql/time.cc:
  Auto merged
mysql-test/suite/rpl/r/rpl_timezone.result:
  Auto merged
mysql-test/suite/rpl/t/rpl_timezone.test:
  Bug 29536 : merge 5.0-opt -> 5.1-opt