merge with 3.9s

diff --git a/lib/fsusage.c b/lib/fsusage.c
index f326c37592fdd1d99d67b84989163b29bc27411a..e8c1bfca1d105246efee3cbe58366c3d66da7988 100644 (file)
--- a/lib/fsusage.c
+++ b/lib/fsusage.c
@@ -20,6 +20,7 @@
 #endif
 
 #include <sys/types.h>
+#include <sys/stat.h>
 #include "fsusage.h"
 #include "safe-stat.h"
 
@@ -50,7 +51,6 @@ int statfs ();
 #endif
 
 #ifdef HAVE_DUSTAT_H           /* AIX PS/2.  */
-#include <sys/stat.h>
 #include <sys/dustat.h>
 #endif
 

diff --git a/old/fileutils/ChangeLog b/old/fileutils/ChangeLog
index a65f9ed9557678a18f9028d62177118e880e7a6e..c28f8722edfa0229f3447d6442ec78748282dbbc 100644 (file)
--- a/old/fileutils/ChangeLog
+++ b/old/fileutils/ChangeLog
@@ -5,7 +5,7 @@ Thu Oct 27 00:02:45 1994  Jim Meyering  (meyering@comco.com)
 
        * df.c: New option: --sync (-s).  No longer perform sync by default.
        Do it only when this option is used.  Invoking sync can be very
-       expensive, and it's not that clear doing so yields more up to date
+       expensive, and it's not clear that doing so yields more up to date
        results.  With encouragement/prodding from Paolo Zeppegno
        (paolo@to.sem.it), Nick Holloway, and Kaveh Ghazi.