Merge five.local.lan:/work/merge/mysql-5.0-funcs_1

into  five.local.lan:/work/merge/mysql-5.1-funcs_1


mysql-test/Makefile.am:
  Fix of Makefile.am has happened by Changeset of Joerg