Rev 641: merge from volker in http://samba.org/~tridge/3_0-ctdb

[tridge at samba.org]

------------------------------------------------------------
revno: 641
revision-id: tridge at samba.org-20071016075643-iim7tovlypnujm74
parent: tridge at samba.org-20071016072902-lj8ftd20qghh3lug
committer: Andrew Tridgell <tridge at samba.org>
branch nick: s3-ctdb-tridge
timestamp: Tue 2007-10-16 17:56:43 +1000
message:
  merge from volker
modified:
  source/modules/nfs4_acls.c     nfs4_acls.c-20070210173807-1wjifrbwaz6xnmgl-648
  source/nsswitch/wbinfo.c       wbinfo.c-20070210173807-1wjifrbwaz6xnmgl-720
  source/passdb/lookup_sid.c     lookup_sid.c-20070210173807-1wjifrbwaz6xnmgl-771
  source/smbd/trans2.c           trans2.c-20070210173807-1wjifrbwaz6xnmgl-1044
  source/utils/net_idmap.c       net_idmap.c-20070210173807-1wjifrbwaz6xnmgl-1127
  source/utils/testparm.c        testparm.c-20070210173807-1wjifrbwaz6xnmgl-1165

Diff too large for email (403, the limit is 200).