Merge from emacs-23 branch.