From: Jan Djärv <jan.h.d@swipnet.se>
Date: Thu, 1 Apr 2010 12:40:34 +0000 (+0200)
Subject: Merge from trunk
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8213fca2584e012781a1902dc8b1c9f5be546f6f;p=emacs.git

Merge from trunk
---

8213fca2584e012781a1902dc8b1c9f5be546f6f
diff --cc lisp/dired.el
index c3d1435401e,c3d1435401e..0dc53bf32c4
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@@ -3974,7 -3974,7 +3974,7 @@@ true then the type of the file linked t
  ;;;***
  
  ;;;### (autoloads (dired-do-relsymlink dired-jump) "dired-x" "dired-x.el"
--;;;;;;  "bb37ec379c0a523368794491b691fd8d")
++;;;;;;  "2f8d3d5a31b969b181e23c40d6bb16a0")
  ;;; Generated autoloads from dired-x.el
  
  (autoload 'dired-jump "dired-x" "\