into amd64.(none):/src/bug24400/my51-bug24400 BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56: Auto merged