Merge branch 'upstream'

diff --combined .gitignore
index 945d17a6dbca234e47179c8d943a0cf91cf7f152,f5b5cf044f2ede7bf0c8972604d372d552a52797..aa579b883838dc004e5ae94c2d14c350032b5626
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -64,8 -64,8 +64,9 @@@ tests/nsm_client/nlm_sm_inter.
  tests/nsm_client/nlm_sm_inter_clnt.c
  tests/nsm_client/nlm_sm_inter_svc.c
  tests/nsm_client/nlm_sm_inter_xdr.c
+ utils/nfsidmap/nfsidmap
  # cscope database files
  cscope.*
  # generic editor backup et al
  *~
 +.pc