Merge branch 'master' into kiconv2

diff --cc lib/Makefile
Simple merge

diff --cc sys/vfs/isofs/cd9660/cd9660_vfsops.c
Simple merge

diff --cc sys/vfs/isofs/cd9660/cd9660_vnops.c
Simple merge

diff --cc sys/vfs/msdosfs/msdosfs_lookup.c
Simple merge

diff --cc sys/vfs/msdosfs/msdosfs_vfsops.c
Simple merge

diff --cc sys/vfs/msdosfs/msdosfs_vnops.c
Simple merge