into  rama.(none):/home/jimw/my/mysql-5.1-clean


sql/field.h:
  Resolve conflict
sql/ha_federated.cc:
  Resolve conflict