Merge change 22732 into eclair

* changes:
  clean up the too many deletes dialog