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


BUILD/compile-pentium-debug:
  Auto merged
BUILD/compile-pentium-debug-max-no-ndb:
  Auto merged
BUILD/compile-pentium64-debug-max:
  Auto merged
BUILD/compile-pentium64-debug:
  Auto merged
BUILD/compile-pentium-debug-max:
  merge fix