[ Merge from Emacs (gnus-5_10-branch): ]