from trunk

diff --cc src/ChangeLog
index 1b1a9c1ee73c3ee0db0bb7575f7d608e7539b61d,54828b43a73c38968405e236de4bb1fc42e6295f..eb996b92a731b612b3709ad3e14e4a22268aa4d3
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,8 -1,9 +1,14 @@@
 +2010-01-27  Kenichi Handa  <handa@m17n.org>
 +
 +      * regex.c (analyse_first): Fix setting of fastmap for unibyte
 +      pattern string.
 +
+ 2010-01-27  David De La Harpe Golden  <david@harpegolden.net>
+ 
+       * fileio.c (Frename_file): Call copy-directory and
+       delete-directory for directories, in order to handle cross-device
+       renaming (Bug#3353).
+ 
  2010-01-25  Jan Djärv  <jan.h.d@swipnet.se>
  
        * xfns.c (Fx_create_frame): If frame height is too big, try