Merge remote branch 'origin/master'

Conflicts:
	mount/Makefile.am
	sys-utils/ipcs.c
	tests/ts/blkid/images-fs/befs.img.bz2
	tests/ts/blkid/images-fs/ddf-raid.img.bz2

diff --cc .gitignore
Simple merge

diff --cc NEWS
Simple merge

diff --cc login-utils/Makefile.am
Simple merge

diff --cc mount/Makefile.am
index 1fbdfe82416542e2c9982f32eccae63614413e04,83e1fcdd8a992ecda6fba933895d6e196202265d..5ff4fc9e4a7b03e03d5e0a4758fc55db0261c1f5
--- 1/mount/Makefile.am
--- 2/mount/Makefile.am
+++ b/mount/Makefile.am
@@@ -7,7 -7,7 +7,7 @@@ sbin_PROGRAMS = losetup swapo
  dist_man_MANS = fstab.5 mount.8 swapoff.8 swapon.8 umount.8 losetup.8
  
  # generic sources for all programs (mount, umount, losetup)
- srcs_common = sundries.c xmalloc.c ../lib/canonicalize.c sundries.h xmalloc.h rmd160.c
 -srcs_common = sundries.c xmalloc.c $(top_srcdir)/lib/canonicalize.c sundries.h xmalloc.h
++srcs_common = sundries.c xmalloc.c $(top_srcdir)/lib/canonicalize.c sundries.h xmalloc.h rmd160.c
  
  # generic header for mount and umount
  hdrs_mount = fstab.h mount_mntent.h mount_constants.h \

diff --cc mount/mount.8
Simple merge

diff --cc mount/mount.c
Simple merge

diff --cc sys-utils/ipcs.c
index 99ad09d793c07c0eff6a8334453fd202f51550c4,2ef5788deef68c4824c0d7111972f6dbb118335d..0a950f664d31d9c4cf33b6214dd6ceb66db38a31
--- 1/sys-utils/ipcs.c
--- 2/sys-utils/ipcs.c
+++ b/sys-utils/ipcs.c
@@@ -494,11 -522,9 +522,11 @@@ void do_msg (char format
                return;
  
        case STATUS:
-               printf (_("------ Messages: Status --------\n"));
+               printf (_("------ Messages Status --------\n"));
 +#ifndef __FreeBSD_kernel__
                printf (_("allocated queues = %d\n"), msginfo.msgpool);
                printf (_("used headers = %d\n"), msginfo.msgmap);
 +#endif
                printf (_("used space = %d bytes\n"), msginfo.msgtql);
                return;