auto upstream

diff --cc configure.ac
Simple merge

diff --cc lisp/mail/rmail.el
index a2cb7cb9ee80a1ca54b10151e9f64d2965e5bdc8,a2cb7cb9ee80a1ca54b10151e9f64d2965e5bdc8,a2cb7cb9ee80a1ca54b10151e9f64d2965e5bdc8..372b120046c5c1380ec00a97693e20c81f4a1839
--- 1/lisp/mail/rmail.el
--- 2/lisp/mail/rmail.el
--- 3/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@@@ -4707,7 -4707,7 -4707,7 +4707,7 @@@@ If prefix argument REVERSE is non-nil, 
   \f
   ;;;### (autoloads (rmail-summary-by-senders rmail-summary-by-topic
   ;;;;;;  rmail-summary-by-regexp rmail-summary-by-recipients rmail-summary-by-labels
---;;;;;;  rmail-summary) "rmailsum" "rmailsum.el" "6cafe6b03e187b5836e3c359322b5cbf")
+++;;;;;;  rmail-summary) "rmailsum" "rmailsum.el" "856fc6e337d5398b302c448ee7a2315e")
   ;;; Generated autoloads from rmailsum.el
   
   (autoload 'rmail-summary "rmailsum" "\