err.no Git - util-linux/commit

Merge commit 'v2.17.1' into stable/v2.17

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

author	LaMont Jones <lamont@debian.org>
	Mon, 1 Mar 2010 15:53:05 +0000 (08:53 -0700)
committer	LaMont Jones <lamont@debian.org>
	Mon, 1 Mar 2010 15:53:05 +0000 (08:53 -0700)
commit	1a7e95e3e66f89a0a31d57d0c013620cd820a478
tree	46a07e358938bed6c4281f8dfde40159d29ac6a7	tree \| snapshot
parent	a447cac0b58f6db9b2487cbff9a8c60b7273c9bb	commit \| diff
parent	90ed153d5c30690a29723eb548f645d2adcaa327	commit \| diff

login-utils/Makefile.am	diff1 \|	diff2 \|	blob \| history
mount/mount.8	diff1 \|	diff2 \|	blob \| history
mount/mount.c	diff1 \|	diff2 \|	blob \| history