upstream

diff --cc lisp/emacs-lisp/cl-loaddefs.el
index f0554342a09c5606e5baab496c98df1c82abb840,6148ec71548b68775eca78893010d36385a40fb2..b389e78bc39862ed6d19ce113de27ba34dd4339a
--- 1/lisp/emacs-lisp/cl-loaddefs.el
--- 2/lisp/emacs-lisp/cl-loaddefs.el
+++ b/lisp/emacs-lisp/cl-loaddefs.el
@@@ -279,8 -267,7 +267,7 @@@ Remove from SYMBOL's plist the propert
  ;;;;;;  cl-return cl-block cl-etypecase cl-typecase cl-ecase cl-case
  ;;;;;;  cl-load-time-value cl-eval-when cl-destructuring-bind cl-function
  ;;;;;;  cl-defmacro cl-defun cl-gentemp cl-gensym) "cl-macs" "cl-macs.el"
--;;;;;;  "32abce1bd6f38339285a6071e1be5e59")
- >>>>>>> MERGE-SOURCE
++;;;;;;  "4a758f183747246fe042bf42b6ddd85c")
  ;;; Generated autoloads from cl-macs.el
  
  (autoload 'cl-gensym "cl-macs" "\