Merge commit 'origin/v3-2-test' into v3-2-ctdb

Import Bugfixes from v3-2-test to v3-2-ctdb.

Michael

diff --cc source/Makefile.in
Simple merge

diff --cc source/lib/dbwrap_util.c
Simple merge

diff --cc source/lib/util.c
Simple merge

diff --cc source/modules/vfs_default.c
Simple merge

diff --cc source/nmbd/nmbd.c
Simple merge

diff --cc source/param/loadparm.c
Simple merge

diff --cc source/smbd/server.c
Simple merge

diff --cc source/winbindd/winbindd.c
Simple merge

diff --cc source/winbindd/winbindd_cache.c
Simple merge

diff --cc source/winbindd/winbindd_cm.c
Simple merge

diff --cc source/winbindd/winbindd_dual.c
Simple merge

diff --cc source/winbindd/winbindd_util.c
Simple merge