Merge branch 'upstream'
authorBen Hutchings <ben@decadent.org.uk>
Wed, 14 Jul 2010 02:16:17 +0000 (03:16 +0100)
committerBen Hutchings <ben@decadent.org.uk>
Wed, 14 Jul 2010 02:16:17 +0000 (03:16 +0100)
commit6295bb04c73403a219bc96cc6770fc96bec19ba6
treee6297f96895dc2f8371498499284576510cc3dba
parentd3dcf7a556c2782f02ac275c0c1b708c324b5541
parentb7ef14fb0c88ebabc3e3227bb743d6a0ba94b5b2
Merge branch 'upstream'

Conflicts:
Makefile.in
aclocal.m4
aclocal/ltversion.m4
compile
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