Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-RPMs

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-RPMs


BUILD/check-cpu:
  Auto merged
support-files/mysql.spec.sh:
  null merge