Index: coreutils/lib/mountlist.c
===================================================================
RCS file: /cvsroot/coreutils/coreutils/lib/mountlist.c,v
retrieving revision 1.55
diff -p -d -U6 -r1.55 mountlist.c
--- coreutils/lib/mountlist.c	22 Sep 2005 06:05:39 -0000	1.55
+++ coreutils/lib/mountlist.c	11 Oct 2005 14:34:12 -0000
@@ -140,12 +140,14 @@ char *strstr ();
 # define SIZE_MAX ((size_t) -1)
 #endif
 
 #ifndef ME_DUMMY
 # define ME_DUMMY(Fs_name, Fs_type)		\
     (strcmp (Fs_type, "autofs") == 0		\
+     || strcmp (Fs_type, "none") == 0       \
+     || strcmp (Fs_type, "proc") == 0       \
      || strcmp (Fs_type, "subfs") == 0		\
      /* for Irix 6.5 */				\
      || strcmp (Fs_type, "ignore") == 0)
 #endif
 
 #ifndef ME_REMOTE
Index: coreutils/src/df.c
===================================================================
RCS file: /cvsroot/coreutils/coreutils/src/df.c,v
retrieving revision 1.168
diff -p -d -U6 -r1.168 df.c
--- coreutils/src/df.c	16 Aug 2005 20:33:40 -0000	1.168
+++ coreutils/src/df.c	11 Oct 2005 14:34:12 -0000
@@ -719,13 +719,13 @@ or all file systems by default.\n\
 \n\
 "), stdout);
       fputs (_("\
 Mandatory arguments to long options are mandatory for short options too.\n\
 "), stdout);
       fputs (_("\
-  -a, --all             include file systems having 0 blocks\n\
+  -a, --all             include dummy file systems\n\
   -B, --block-size=SIZE use SIZE-byte blocks\n\
   -h, --human-readable  print sizes in human readable format (e.g., 1K 234M 2G)\n\
   -H, --si              likewise, but use powers of 1000 not 1024\n\
 "), stdout);
       fputs (_("\
   -i, --inodes          list inode information instead of block usage\n\
Index: coreutils/NEWS
===================================================================
RCS file: /cvsroot/coreutils/coreutils/NEWS,v
retrieving revision 1.319
diff -p -d -U6 -r1.319 NEWS
--- coreutils/NEWS	1 Oct 2005 09:50:09 -0000	1.319
+++ coreutils/NEWS	11 Oct 2005 14:34:12 -0000
@@ -200,12 +200,14 @@ GNU coreutils NEWS                      
   date, du, ls, and pr's time formats now support new %:z, %::z, %:::z
   specifiers for numeric time zone offsets like -07:00, -07:00:00, and -07.
 
   dd has new iflag= and oflag= flags "binary" and "text", which have an
   effect only on nonstandard platforms that distinguish text from binary I/O.
 
+  df now ignores bind mounts by default; use "-a" to not ignore them.
+
   du accepts new options: --time[=TYPE] and --time-style=STYLE
 
   join now supports a NUL field separator, e.g., "join -t '\0'".
   join now detects and reports incompatible options, e.g., "join -t x -t y",
 
   ls no longer outputs an extra space between the mode and the link count