into  gbichot3.local:/home/mysql_src/mysql-5.1-rpl-26194


sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged