Merge branch 'upstream'
authorBen Hutchings <ben@decadent.org.uk>
Wed, 14 Jul 2010 02:03:30 +0000 (03:03 +0100)
committerBen Hutchings <ben@decadent.org.uk>
Wed, 14 Jul 2010 02:03:30 +0000 (03:03 +0100)
commit2dd083c5bdb5b38729b46dc65c886c77aa5a82b9
treea05d37f46016fefe9cb7f61bfe263973030328b1
parent0e40f41db2942ae78bef188d77d1e293f6b46a8e
parent515695dc49c168a2e4c5f3ad93004c1b13e27c68
Merge branch 'upstream'

Conflicts:
Makefile.in
aclocal.m4
config.guess
config.sub
configure
linux-nfs/Makefile.in
ltmain.sh
support/Makefile.in
support/export/Makefile.in
support/include/Makefile.in
support/include/config.h.in
support/include/nfs/Makefile.in
support/include/rpcsvc/Makefile.in
support/include/sys/Makefile.in
support/include/sys/fs/Makefile.in
support/misc/Makefile.in
support/nfs/Makefile.in
tools/Makefile.in
tools/locktest/Makefile.in
tools/nlmtest/Makefile.in
tools/rpcdebug/Makefile.in
tools/rpcgen/Makefile.in
utils/Makefile.in
utils/exportfs/Makefile.in
utils/gssd/Makefile.in
utils/idmapd/Makefile.in
utils/mount/Makefile.in
utils/mountd/Makefile.in
utils/nfsd/Makefile.in
utils/nfsstat/Makefile.in
utils/showmount/Makefile.in
utils/statd/Makefile.in