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

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


BitKeeper/deleted/.del-CMakeLists.txt~7:
  Auto merged