Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work


support-files/mysql.spec.sh:
  merge fix