Merge from mainline.
commit9dd44e9174748faf99bb3e6b02a43f4a57490f12
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 17 Jan 2011 19:47:38 +0000 (17 11:47 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 17 Jan 2011 19:47:38 +0000 (17 11:47 -0800)
tree23fedf7e30744da17e4a4588f1bba1c4fa692f4f
parent9fd0ff4c889cdbc367ff43ae4cf55ed00ced5bda
Merge from mainline.
lisp/dired.el
lisp/emacs-lisp/cl-loaddefs.el
lisp/htmlfontify.el
lisp/mail/rmail.el
lisp/ps-print.el