Merge branch 'upstream'
authorBen Hutchings <ben@decadent.org.uk>
Wed, 14 Jul 2010 01:57:29 +0000 (02:57 +0100)
committerBen Hutchings <ben@decadent.org.uk>
Wed, 14 Jul 2010 01:57:29 +0000 (02:57 +0100)
commit6826dcf4e9e00f466ecaeeb8369dc7308df36a86
treeb713ceaa25971034e1e7305989851c8cb5278972
parent9a5812b2f70c7fca4e862d11b9f567339389c534
parent9c12792df20d2f218ef74a73b5f7acccbe0d5a55
Merge branch 'upstream'

Conflicts:
Makefile.in
autom4te.cache/output.0
autom4te.cache/output.1
autom4te.cache/traces.0
autom4te.cache/traces.1
config.guess
config.sub
configure
linux-nfs/Makefile.in
support/Makefile.in
support/export/Makefile.in
support/include/Makefile.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