into  xiphis.org:/home/antony/work2/p4-bug12096.3


configure.in:
  Auto merged
sql/mysqld.cc:
  Auto merged
strings/Makefile.am:
  Auto merged