Merge remote branch 'origin/master'

Conflicts:
	tests/ts/blkid/images-fs/adaptec-raid.img.bz2
	tests/ts/blkid/images-fs/ddf-raid.img.bz2
	tests/ts/blkid/images-fs/gfs2.img.bz2
	tests/ts/blkid/images-fs/hpt37x-raid.img.bz2
	tests/ts/blkid/images-fs/isw-raid.img.bz2
	tests/ts/blkid/images-fs/jbd.img.bz2
	tests/ts/blkid/images-fs/jmicron-raid.img.bz2
	tests/ts/blkid/images-fs/lvm2.img.bz2
	tests/ts/blkid/images-fs/nvidia-raid.img.bz2
	tests/ts/blkid/images-fs/ocfs2.img.bz2
	tests/ts/blkid/images-fs/promise-raid.img.bz2
	tests/ts/blkid/images-fs/reiser4.img.bz2
	tests/ts/blkid/images-fs/romfs.img.bz2
	tests/ts/blkid/images-fs/silicon-raid.img.bz2
	tests/ts/blkid/images-fs/swap0.img.bz2
	tests/ts/blkid/images-fs/swap1.img.bz2
	tests/ts/blkid/images-fs/via-raid.img.bz2
	tests/ts/blkid/images-fs/vmfs_volume.img.bz2
	tests/ts/blkid/images-fs/zfs.img.bz2

diff --cc .gitignore
index 5c872c2ff4f47c0aee86e238c158371d099b0c4b,a845cf2e936a80622378cd3df0966ff40eabb8c1..f2f7f51a8bfe998fac2d8e07d07c96869d7b4797
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -49,6 -49,3 +49,7 @@@ libtoo
  
  # GTK_DOC_CHECK depends on gtk-doc.m4
  !m4/gtk-doc.m4
 +
 +# cannot deal with bz2 files
 +tests/ts/blkid/images-fs/*.bz2
++tests/ts/blkid/images-fs/*.bz2

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

diff --cc mount/mount.8
Simple merge

diff --cc mount/mount.c
Simple merge