*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 7b056bfb010afd5eebf16f6d07f178f51972ac8d..c6690ecee6309e0363fd0850448cf31eba534e43 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,8 +2,12 @@
 
        * Version 6.0-cvs.
 
-       * gnupload: Restore ""--to... kludge to placate overzealous
-       `make distcheck' check.
+       * src/du.c (main): Rename local, s/symlink_deref_bit/symlink_deref_bits/
+       and arrange for -D to set fts' FTS_PHYSICAL bit as well as
+       FTS_COMFOLLOW.  Spotted by Justin Pryzby.
+
+       * gnupload: Merge changes from automake, retaining the ""--to...
+       kludge to placate overzealous `make distcheck' check.
 
 2006-05-19  Jim Meyering  <jim@meyering.net>