Merge branch 'upstream'
authorBen Hutchings <ben@decadent.org.uk>
Wed, 14 Jul 2010 01:32:49 +0000 (02:32 +0100)
committerBen Hutchings <ben@decadent.org.uk>
Wed, 14 Jul 2010 01:32:49 +0000 (02:32 +0100)
commitf8d5dd05dd28fe122832b229c5298d254eb4b581
treebd854bc485a626d0828ed65227e7da8f3fc16d3d
parentcac8dbae490411fb8d6073eef50976b866035683
parente46ab0be95bb71f399e4ee0e9d06f16ad80d2b61
Merge branch 'upstream'

Conflicts:
configure
debian/changelog
debian/control
debian/etc.exports
debian/nfs-common.default
debian/nfs-common.dirs
debian/nfs-common.init
debian/nfs-common.install
debian/nfs-common.postinst
debian/nfs-common.postrm
debian/nfs-common.prerm
debian/nfs-kernel-server.default
debian/nfs-kernel-server.dirs
debian/nfs-kernel-server.init
debian/nfs-kernel-server.postinst
debian/nfs-kernel-server.postrm
debian/nfs-kernel-server.prerm
debian/rules
support/nfs/exports.c
utils/mountd/mountd.c
utils/mountd/mountd.man
support/nfs/exports.c
utils/gssd/Makefile.in