Merge from emacs--rel--22: lisp/dired-x.el: Revert 2007-04-06 change.

Patches applied:

 * emacs--rel--22  (patch 4-5)

   - Update from CVS

2007-05-01  Romain Francoise  <romain@orebokech.com>

   * lisp/dired-x.el: Revert 2007-04-06 change.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-723

diff --cc admin/FOR-RELEASE
Simple merge

diff --cc lisp/ChangeLog
index d37b4c08ebe49247eac972c06187aca63d95d0ea,4d8f0d81ebfe57c15451340fea2039331ac21802..30ebd225ed2e3b6235f89228885da4dea70a8bbb
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,3 -1,12 +1,7 @@@
 -2007-04-30  Nick Roberts  <nickrob@snap.net.nz>
 -
 -      * progmodes/gud.el (gud-menu-map): Pdb can't handle SIGINT so
 -      don't put stop on toolbar.
 -
+ 2007-05-01  Romain Francoise  <romain@orebokech.com>
+ 
+       * dired-x.el: Revert 2007-04-06 change.
+ 
  2007-04-29  Stephen Berman  <Stephen.Berman@gmx.net>
  
        * find-dired.el (find-dired-filter): Propertize all text down to eob.